Mercurial > octave
diff libgui/graphics/Object.cc @ 18498:2e7cad6f180c gui-release
Initial integration of QtHandles.
* configure.ac: Check for QtOpenGL module.
* libgui/Makefile.am: Include libgui/graphics/module.mk.
(liboctgui_la_LIBADD): Include graphics/libgui-graphics.la in the
list.
(rcc-command): Pass "-name DIR" to rcc command.
* main-window.cc (main_window::construct): Install qt functions and
register qt toolkit.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include
$(FONTCONFIG_CPPFLAGS) and -I$(srcdir)/graphics in the list.
* graphics.cc (gtk_manager::gtk_manager): Make qt the default toolkit
if it is available.
* libgui/graphics/Backend.cc, libgui/graphics/Backend.h,
libgui/graphics/BaseControl.cc, libgui/graphics/BaseControl.h,
libgui/graphics/ButtonControl.cc, libgui/graphics/ButtonControl.h,
libgui/graphics/Canvas.cc, libgui/graphics/Canvas.h,
libgui/graphics/CheckBoxControl.cc, libgui/graphics/CheckBoxControl.h,
libgui/graphics/Container.cc, libgui/graphics/Container.h,
libgui/graphics/ContextMenu.cc, libgui/graphics/ContextMenu.h,
libgui/graphics/EditControl.cc, libgui/graphics/EditControl.h,
libgui/graphics/Figure.cc, libgui/graphics/Figure.h,
libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h,
libgui/graphics/GLCanvas.cc, libgui/graphics/GLCanvas.h, ,
libgui/graphics/GenericEventNotify.h, libgui/graphics/KeyMap.cc,
libgui/graphics/KeyMap.h, libgui/graphics/ListBoxControl.cc,
libgui/graphics/ListBoxControl.h, libgui/graphics/Logger.cc,
libgui/graphics/Logger.h, libgui/graphics/Menu.cc,
libgui/graphics/Menu.h, libgui/graphics/MenuContainer.h,
libgui/graphics/MouseModeActionGroup.cc,
libgui/graphics/MouseModeActionGroup.h, libgui/graphics/Object.cc,
libgui/graphics/Object.h, libgui/graphics/ObjectFactory.cc,
libgui/graphics/ObjectFactory.h, libgui/graphics/ObjectProxy.cc,
libgui/graphics/ObjectProxy.h, libgui/graphics/Panel.cc,
libgui/graphics/Panel.h, libgui/graphics/PopupMenuControl.cc,
libgui/graphics/PopupMenuControl.h,
libgui/graphics/PushButtonControl.cc,
libgui/graphics/PushButtonControl.h, libgui/graphics/PushTool.cc,
libgui/graphics/PushTool.h, libgui/graphics/RadioButtonControl.cc,
libgui/graphics/RadioButtonControl.h,
libgui/graphics/SliderControl.cc, libgui/graphics/SliderControl.h,
libgui/graphics/TextControl.cc, libgui/graphics/TextControl.h,
libgui/graphics/TextEdit.cc, libgui/graphics/TextEdit.h,
libgui/graphics/ToggleButtonControl.cc,
libgui/graphics/ToggleButtonControl.h, libgui/graphics/ToggleTool.cc,
libgui/graphics/ToggleTool.h, libgui/graphics/ToolBar.cc,
libgui/graphics/ToolBar.h, libgui/graphics/ToolBarButton.cc,
libgui/graphics/ToolBarButton.h, libgui/graphics/Utils.cc,
libgui/graphics/Utils.h, libgui/graphics/__init_qt__.cc,
libgui/graphics/__init_qt__.h, libgui/graphics/gl-select.cc,
libgui/graphics/gl-select.h, libgui/graphics/images/README,
libgui/graphics/images/pan.png, libgui/graphics/images/rotate.png,
libgui/graphics/images/select.png, libgui/graphics/images/zoom.png,
libgui/graphics/module.mk, libgui/graphics/qthandles.qrc:
New files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Feb 2014 14:05:45 -0500 |
parents | |
children | 49877d3be064 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/Object.cc Thu Feb 20 14:05:45 2014 -0500 @@ -0,0 +1,193 @@ +/* + +Copyright (C) 2011 Michael Goffioul. + +This file is part of QtHandles. + +Foobar 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. + +QtHandles 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 Foobar. If not, see <http://www.gnu.org/licenses/>. + +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <QVariant> + +#include "Backend.h" +#include "Object.h" +#include "Utils.h" + +////////////////////////////////////////////////////////////////////////////// + +namespace QtHandles +{ + +////////////////////////////////////////////////////////////////////////////// + +Object::Object (const graphics_object& go, QObject* obj) + : QObject (), m_handle (go.get_handle ()), m_qobject (0) +{ + gh_manager::auto_lock lock (false); + + if (! lock) + 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", + qVariantFromValue<void*> (this)); + connect (m_qobject, SIGNAL (destroyed (QObject*)), + SLOT (objectDestroyed (QObject*))); + } +} + +////////////////////////////////////////////////////////////////////////////// + +Object::~Object (void) +{ +} + +////////////////////////////////////////////////////////////////////////////// + +graphics_object Object::object (void) const +{ + gh_manager::auto_lock lock (false); + + if (! lock) + qCritical ("QtHandles::Object::object: " + "accessing graphics object (h=%g) without a valid lock!!!", + m_handle.value ()); + + return gh_manager::get_object (m_handle); +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::slotUpdate (int pId) +{ + gh_manager::auto_lock 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::auto_lock lock; + + finalize (); +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::slotRedraw (void) +{ + gh_manager::auto_lock lock; + + if (object ().valid_object ()) + redraw (); +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::update (int /* pId */) +{ +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::finalize (void) +{ + if (m_qobject) + { + delete m_qobject; + m_qobject = 0; + } + deleteLater (); +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::redraw (void) +{ +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::beingDeleted (void) +{ +} + +////////////////////////////////////////////////////////////////////////////// + +void Object::objectDestroyed (QObject* obj) +{ + if (obj && obj == m_qobject) + m_qobject = 0; +} + +////////////////////////////////////////////////////////////////////////////// + +Object* Object::parentObject (const graphics_object& go) +{ + Object* parent = Backend::toolkitObject + (gh_manager::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*> (qVariantValue<void*> (v)); + + return 0; +} + +////////////////////////////////////////////////////////////////////////////// + +}; // namespace QtHandles