Mercurial > octave
view libgui/graphics/Object.h @ 27303:07b330708e3c
use Qt signals for interpreter callbacks in Qt graphics toolkit
* Backend.h, Backend.cc (Backend::m_interpreter): New data member.
(Backend::createObject): Pass pointer to invoking Backend object in
signal argument list.
(Backend::interpreter_event): New slots. Access interpreter
event_manager to post interpreter callbacks events here.
* ObjectFactory.h, ObjectFactory.cc (ObjectFactory::createObject): New
arg, backend. Connect interpreter_event signal from newly created
object to interpreter_event slot in backend object.
* __init_qt__.cc (__init__): Pass interpreter to Backend constructor.
* module.mk (OCTAVE_GUI_GRAPHICS_MOC): New files, moc-Canvas.cc and
moc-Container.cc.
* Object.h (Object::interpreter_event): New signals.
* Canvas.h, Canvas.cc (Canvas::interprter_event): New signals.
(Canvas::canvasMouseReleaseEvent): Emit interpreter_event signal
instead of accessing interpreter event_manager object directly here.
* GLCanvas.cc (GLCanvas::do_print): Emit interpreter_event signal
instead of accessing interpreter event_manager object directly here.
* Container.h, Container.cc (Container::interpreter_event):
New signals.
(Container::canvas): Forward Canvas interpreter_event signals to
Container interpreter_event signals.
* ButtonGroup.cc (ButtonGroup::ButtonGroup) Forward Container
interpreter_event signals to the ButtonGroup interpreter_event
signal. Since ButtonGroup is derived from Object, this connection and
the one made by ObjectFactory::createObject has the effect of passing
the interpreter_event signal up to the Backend interpreter_event slot.
* Figure.cc (Figure::Figure): Likewise, for Figure.
* Panel.cc (Panel::Panel): Likewise, for Panel.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 29 Jul 2019 10:43:20 -0400 |
parents | 00f796120a6d |
children | 718116e9c7d3 |
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_Object_h) #define octave_Object_h 1 #include <QObject> #include "event-manager.h" #include "graphics.h" class QObject; class QString; class QWidget; namespace QtHandles { class Container; class ObjectProxy; class Object : public QObject { Q_OBJECT public: Object (const graphics_object& go, QObject *obj = nullptr); virtual ~Object (void); base_properties& properties (void) { return object ().get_properties (); } const base_properties& properties (void) const { return object ().get_properties (); } template <typename T> typename T::properties& properties (void) { return dynamic_cast<typename T::properties&> (object ().get_properties ()); } template <typename T> const typename T::properties& properties (void) const { return dynamic_cast<const typename T::properties&> (object ().get_properties ()); } graphics_object object (void) const; virtual QObject * qObject (void) { return m_qobject; } template <typename T> T * qWidget (void) { return qobject_cast<T *>(qObject ()); } virtual Container * innerContainer (void) = 0; static Object * fromQObject (QObject *obj); signals: void interpreter_event (const octave::fcn_callback& fcn); void interpreter_event (const octave::meth_callback& meth); public slots: void slotUpdate (int pId); void slotFinalize (void); void slotRedraw (void); void slotShow (void); void slotPrint (const QString& file_cmd, const QString& term); void objectDestroyed (QObject *obj = nullptr); protected: static Object * parentObject (const graphics_object& go); void init (QObject *obj, bool callBase = false); virtual void update (int pId); virtual void finalize (void); virtual void redraw (void); virtual void show (void); virtual void print (const QString& file_cmd, const QString& term); virtual void beingDeleted (void); protected: // Store the graphics object directly so that it will exist when // we need it. Previously, it was possible for the graphics // backend to get a handle to a figure, then have the interpreter // thread delete the corresponding object before the backend (GUI) // thread had a chance to display it. It should be OK to store // this object and use it in both threads (graphics_object uses a // std::shared_ptr) provided that we protect access with mutex locks. graphics_object m_go; // Handle to the graphics object. This may be redundant now. // Also, the whole ObjectProxy thing may not need to store a // pointer now? Maybe we can just have a lookup table from figure // handle to Object? What does the FLTK toolkit do? Why does // this seem to be so complicated? graphics_handle m_handle; QObject *m_qobject; }; } #endif