Mercurial > octave
diff libgui/graphics/Object.cc @ 27335:50216d7a2f6b
eliminate static wrapper functions in gh_manager class
This is a large but straightforward change to eliminate the remains of
the singleton pattern that was used for the gh_manager class. All
static functions in the gh_manager class that previously used the
"instance" function to access the gh_manager object stored in the
global interpreter object and then called the corresponding "do_"
functions have been eliminated. The "do_" prefix has been removed
from the normal member functions and all uses of the static functions
(calls of the form gh_manager::X) have been replaced with a call to the
member function. The gh_manager object is accessed through the
interpreter object and there is a new __get_gh_manager__ convenience
function defined in the intepreter-private.cc file.
Additionally, instead of using the gh_manager::auto_lock class, we
access the mutex variable associated with the gh_manager object and
pass it to the octave::autolock constructor to manage scoped locks for
the gh_manager class.
The following interpreter functions are now "methods" and require the
interpreter as the first argument: F__calc_dimensions__,
F__fltk_check__, F__get__, F__get_frame__, F__go_axes__,
F__go_delete__, F__go_execute_callback__, F__go_figure__,
F__go_figure_handles__, F__go_handles__, F__go_hggroup__,
F__go_image__, F__go_light__, F__go_line__, F__go_patch__,
F__go_post_callback__, F__go_surface__, F__go_text__,
F__go_uibuttongroup__, F__go_uicontextmenu__, F__go_uicontrol__,
F__go_uimenu__, F__go_uipanel__, F__go_uipushtool__, F__go_uitable__,
F__go_uitoggletool__, F__go_uitoolbar__, F__image_pixel_size__,
F__show_figure__, F__shutdown_qt__, F__update_normals__, F__zoom__,
Faddlistener, Faddproperty, Fdellistener, Fdrawnow, Fget, Fishghandle,
Fkbhit, Fpause, Freset, Fset, and Fwaitfor.
Files affected:
BaseControl.cc, ButtonControl.cc, ButtonGroup.cc, Canvas.cc,
Container.cc, ContextMenu.cc, Figure.cc, GLCanvas.cc, Object.cc,
Panel.cc, QtHandlesUtils.h, SliderControl.cc, Table.cc,
__init_qt__.cc, qt-graphics-toolkit.cc, main-window.cc, gl-render.cc,
gl-render.h, gl2ps-print.cc, graphics-toolkit.cc, graphics.cc,
graphics.in.h, input.cc, interpreter.cc, sysdep.cc, utils.cc,
__init_fltk__.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 09 Aug 2019 10:36:08 -0400 |
| parents | 718116e9c7d3 |
| children | 1952e110d346 |
line wrap: on
line diff
--- a/libgui/graphics/Object.cc Wed Aug 07 12:57:25 2019 -0700 +++ b/libgui/graphics/Object.cc Fri Aug 09 10:36:08 2019 -0400 @@ -31,15 +31,20 @@ #include "QtHandlesUtils.h" #include "qt-graphics-toolkit.h" +#include "graphics.h" +#include "interpreter-private.h" + namespace QtHandles { Object::Object (const graphics_object& go, QObject *obj) : QObject (), m_go (go), m_handle (go.get_handle ()), m_qobject (nullptr) { - gh_manager::auto_lock lock (false); + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::Object"); - if (! lock) + octave::autolock guard (gh_mgr.graphics_lock ()); + + if (! guard) qCritical ("QtHandles::Object::Object: " "creating Object (h=%g) without a valid lock!!!", m_handle.value ()); @@ -71,9 +76,11 @@ graphics_object Object::object (void) const { - gh_manager::auto_lock lock (false); + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::object"); - if (! lock) + octave::autolock guard (gh_mgr.graphics_lock (), false); + + if (! guard) qCritical ("QtHandles::Object::object: " "accessing graphics object (h=%g) without a valid lock!!!", m_handle.value ()); @@ -84,7 +91,9 @@ void Object::slotUpdate (int pId) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::slotUpdate"); + + octave::autolock guard (gh_mgr.graphics_lock ()); switch (pId) { @@ -105,7 +114,9 @@ void Object::slotFinalize (void) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::slotFinalize"); + + octave::autolock guard (gh_mgr.graphics_lock ()); finalize (); } @@ -113,7 +124,9 @@ void Object::slotRedraw (void) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::slotRedraw"); + + octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) redraw (); @@ -122,7 +135,9 @@ void Object::slotShow (void) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::slotShow"); + + octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) show (); @@ -131,7 +146,9 @@ void Object::slotPrint (const QString& file_cmd, const QString& term) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::slotPrint"); + + octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) print (file_cmd, term); @@ -177,10 +194,12 @@ Object* Object::parentObject (const graphics_object& go) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("Object::parentObject"); + + octave::autolock guard (gh_mgr.graphics_lock ()); Object *parent = qt_graphics_toolkit::toolkitObject - (gh_manager::get_object (go.get_parent ())); + (gh_mgr.get_object (go.get_parent ())); return parent; }