Mercurial > octave
view libgui/graphics/Object.cc @ 29542:3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
This changes switches most code in the libgui/src and libgui/graphics
directories to use the new Qt style of connecting signals and slots
that uses pointers to member functions or function objects instead of
strings to refer to the signal and slot functions. For an
introduction, see https://wiki.qt.io/New_Signal_Slot_Syntax.
There are many connections left to adapt. In some cases, there are
overloaded functions (or default parameters) that need to be handled.
Use of QOverload<> or an anonymous function should fix these. In
others, we are connecting to parent objects where we only have a
pointer to QWidget instead of a specific type of object. To fix
those, we need to either move the code that makes th connection to a
place where the actual types of both objects are known or pass more
specific types as the parent object. In a few cases, there appear to
real mismatches in the types of objects and the signal/slot
functions.
Files affected: ButtonControl.cc, ButtonGroup.cc, ContextMenu.cc,
EditControl.cc, Figure.cc, ListBoxControl.cc, Menu.cc, Object.cc,
ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushTool.cc,
SliderControl.cc, Table.cc, ToggleTool.cc, ToolBar.cc,
annotation-dialog.cc, qt-graphics-toolkit.cc, color-picker.cc,
command-widget.cc, dialog.cc, documentation-bookmarks.cc,
documentation.cc, files-dock-widget.cc, find-files-dialog.cc,
history-dock-widget.cc, interpreter-qobject.cc, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, find-dialog.cc,
octave-qscintilla.cc, main-window.cc, octave-dock-widget.cc,
octave-qobject.cc, qt-interpreter-events.cc, set-path-dialog.cc,
set-path-model.cc, settings-dialog.cc, shortcut-manager.cc,
tab-bar.cc, variable-editor-model.cc, variable-editor.cc,
welcome-wizard.cc, welcome-wizard.h, workspace-view.cc, and
workspace-view.h.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 16 Apr 2021 23:06:32 -0400 |
parents | 0a5b15007766 |
children | 6ea4a84df9c7 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2021 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // 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 (HAVE_CONFIG_H) # include "config.h" #endif #include <QString> #include <QVariant> #include "Object.h" #include "QtHandlesUtils.h" #include "octave-qobject.h" #include "qt-graphics-toolkit.h" #include "graphics.h" #include "interpreter.h" namespace QtHandles { Object::Object (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go, QObject *obj) : QObject (), m_octave_qobj (oct_qobj), m_interpreter (interp), m_go (go), m_handle (go.get_handle ()), m_qobject (nullptr) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); if (! guard) qCritical ("QtHandles::Object::Object: " "creating Object (h=%g) without a valid lock!!!", m_handle.value ()); init (obj); } void Object::init (QObject *obj, bool) { if (m_qobject) qCritical ("QtHandles::Object::init: " "resetting QObject while in invalid state"); m_qobject = obj; if (m_qobject) { m_qobject->setProperty ("QtHandles::Object", QVariant::fromValue<void*> (this)); connect (m_qobject, &QObject::destroyed, this, &Object::objectDestroyed); } } Object::~Object (void) { } graphics_object Object::object (void) const { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); 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 ()); return m_go; } void Object::slotUpdate (int pId) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); switch (pId) { // Special case for objects being deleted, as it's very likely // that the graphics_object already has been destroyed when this // is executed (because of the async behavior). case base_properties::ID_BEINGDELETED: beingDeleted (); break; default: if (object ().valid_object ()) update (pId); break; } } void Object::slotFinalize (void) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); finalize (); } void Object::slotRedraw (void) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) redraw (); } void Object::slotShow (void) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) show (); } void Object::slotPrint (const QString& file_cmd, const QString& term) { gh_manager& gh_mgr = m_interpreter.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); if (object ().valid_object ()) print (file_cmd, term); } void Object::update (int /* pId */) { } void Object::finalize (void) { if (m_qobject) { delete m_qobject; m_qobject = nullptr; } deleteLater (); } void Object::redraw (void) { } void Object::show (void) { } void Object::print (const QString& /* file_cmd */, const QString& /* term */) { } void Object::beingDeleted (void) { } void Object::objectDestroyed (QObject *obj) { if (obj && obj == m_qobject) m_qobject = nullptr; } Object* Object::parentObject (octave::interpreter& interp, const graphics_object& go) { gh_manager& gh_mgr = interp.get_gh_manager (); octave::autolock guard (gh_mgr.graphics_lock ()); Object *parent = qt_graphics_toolkit::toolkitObject (gh_mgr.get_object (go.get_parent ())); return parent; } Object* Object::fromQObject (QObject *obj) { QVariant v = obj->property ("QtHandles::Object"); if (v.isValid ()) return reinterpret_cast<Object *> (qvariant_cast<void*> (v)); return nullptr; } void Object::do_connections (const QObject *receiver, const QObject *emitter) { if (! emitter) emitter = this; connect (emitter, SIGNAL (interpreter_event (const octave::fcn_callback&)), receiver, SLOT (interpreter_event (const octave::fcn_callback&))); connect (emitter, SIGNAL (interpreter_event (const octave::meth_callback&)), receiver, SLOT (interpreter_event (const octave::meth_callback&))); connect (emitter, SIGNAL (gh_callback_event (const graphics_handle&, const std::string&)), receiver, SLOT (gh_callback_event (const graphics_handle&, const std::string&))); connect (emitter, SIGNAL (gh_callback_event (const graphics_handle&, const std::string&, const octave_value&)), receiver, SLOT (gh_callback_event (const graphics_handle&, const std::string&, const octave_value&))); connect (emitter, SIGNAL (gh_set_event (const graphics_handle&, const std::string&, const octave_value&)), receiver, SLOT (gh_set_event (const graphics_handle&, const std::string&, const octave_value&))); connect (emitter, SIGNAL (gh_set_event (const graphics_handle&, const std::string&, const octave_value&, bool)), receiver, SLOT (gh_set_event (const graphics_handle&, const std::string&, const octave_value&, bool))); connect (emitter, SIGNAL (gh_set_event (const graphics_handle&, const std::string&, const octave_value&, bool, bool)), receiver, SLOT (gh_set_event (const graphics_handle&, const std::string&, const octave_value&, bool, bool))); } }