Mercurial > octave
view libgui/graphics/QtHandlesUtils.h @ 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 | d2d2f66e1cdc |
children | 2a506bc4a7af |
line wrap: on
line source
/* Copyright (C) 2011-2019 Michael Goffioul This file is part of Octave. Octave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <https://www.gnu.org/licenses/>. */ #if ! defined (octave_QtHandlesUtils_h) #define octave_QtHandlesUtils_h 1 #include <QColor> #include <QFont> #include <QImage> #include <QString> #include <QStringList> #include <string> #include "graphics.h" #include "interpreter-private.h" class QKeyEvent; class QMouseEvent; class QWheelEvent; namespace QtHandles { namespace Utils { QString fromStdString (const std::string& s); std::string toStdString (const QString& s); QStringList fromStringVector (const string_vector& v); string_vector toStringVector (const QStringList& l); Cell toCellString (const QStringList& l); template <typename T> QFont computeFont (const typename T::properties& props, int height = -1); QColor fromRgb (const Matrix& rgb); Matrix toRgb (const QColor& c); Qt::Alignment fromHVAlign (const std::string& halign, const std::string& valign); std::string figureSelectionType (QMouseEvent *event, bool isDoubleClick = false); Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent *event); Matrix figureCurrentPoint (const graphics_object& fig); template <typename T> inline typename T::properties& properties (graphics_object obj) { return dynamic_cast<typename T::properties&> (obj.get_properties ()); } template <typename T> inline typename T::properties& properties (const graphics_handle& h) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("Utils::properties"); return Utils::properties<T> (gh_mgr.get_object (h)); } QImage makeImageFromCData (const octave_value& v, int width = -1, int height = -1); octave_scalar_map makeKeyEventStruct (QKeyEvent *event); octave_scalar_map makeScrollEventStruct (QWheelEvent *event); } } #endif