Mercurial > octave
diff libgui/graphics/ButtonGroup.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 | 6b2d20317b26 |
| children | 028205a91a07 |
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc Wed Aug 07 12:57:25 2019 -0700 +++ b/libgui/graphics/ButtonGroup.cc Fri Aug 09 10:36:08 2019 -0400 @@ -42,6 +42,7 @@ #include "QtHandlesUtils.h" #include "qt-graphics-toolkit.h" +#include "interpreter-private.h" #include "ov-struct.h" namespace QtHandles @@ -183,13 +184,16 @@ { if (! m_blockUpdates) { + gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonGroup::eventFilter"); + if (watched == qObject ()) { switch (xevent->type ()) { case QEvent::Resize: { - gh_manager::auto_lock lock; + octave::autolock guard (gh_mgr.graphics_lock ()); + graphics_object go = object (); if (go.valid_object ()) @@ -219,7 +223,7 @@ if (m->button () == Qt::RightButton) { - gh_manager::auto_lock lock; + octave::autolock guard (gh_mgr.graphics_lock ()); ContextMenu::executeAt (properties (), m->globalPos ()); } @@ -237,7 +241,7 @@ case QEvent::Resize: if (qWidget<QWidget> ()->isVisible ()) { - gh_manager::auto_lock lock; + octave::autolock guard (gh_mgr.graphics_lock ()); properties ().update_boundingbox (); } @@ -353,8 +357,13 @@ case uibuttongroup::properties::ID_SELECTEDOBJECT: { graphics_handle h = pp.get_selectedobject (); - gh_manager::auto_lock lock; - graphics_object go = gh_manager::get_object (h); + + gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonGroup::update"); + + octave::autolock guard (gh_mgr.graphics_lock ()); + + graphics_object go = gh_mgr.get_object (h); + Object *selectedObject = qt_graphics_toolkit::toolkitObject (go); ToggleButtonControl *toggle = static_cast<ToggleButtonControl *> (selectedObject); @@ -454,7 +463,10 @@ Q_UNUSED (toggled); if (! m_blockUpdates) { - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonGroup::buttonToggled"); + + octave::autolock guard (gh_mgr.graphics_lock ()); + uibuttongroup::properties& bp = properties<uibuttongroup> (); graphics_handle oldValue = bp.get_selectedobject (); @@ -479,7 +491,10 @@ { Q_UNUSED (btn); - gh_manager::auto_lock lock; + gh_manager& gh_mgr = octave::__get_gh_manager__ ("ButtonGroup::buttonClicked"); + + octave::autolock guard (gh_mgr.graphics_lock ()); + uibuttongroup::properties& bp = properties<uibuttongroup> (); graphics_handle oldValue = bp.get_selectedobject ();