octave: libgui/graphics/qt-graphics-toolkit.cc annotate

annotate libgui/graphics/qt-graphics-toolkit.cc @ 27647:2a506bc4a7af

eliminate global access to Octave interpreter in qt graphics classes Provide reference to interprerter to qt graphics classes to eliminate need for accessing it through a global variable. * qt-graphics-toolkit.cc (qt_graphics_toolkit::create_object): Pass m_interpreter to create functions for individual graphics objects. * BaseControl.h, BaseControl.cc, ButtonControl.h, ButtonControl.cc, ButtonGroup.h, ButtonGroup.cc, Canvas.h, Canvas.cc, CheckBoxControl.h, CheckBoxControl.cc, Container.h, Container.cc, ContextMenu.h, ContextMenu.cc, EditControl.h, EditControl.cc, Figure.h, Figure.cc, GLCanvas.h, GLCanvas.cc, ListBoxControl.h, ListBoxControl.cc, Menu.h, Menu.cc, Object.h, Object.cc, Panel.h, Panel.cc, PopupMenuControl.h, PopupMenuControl.cc, PushButtonControl.h, PushButtonControl.cc, PushTool.h, PushTool.cc, QtHandlesUtils.h, RadioButtonControl.h, RadioButtonControl.cc, SliderControl.h, SliderControl.cc, Table.h, Table.cc, TextControl.h, TextControl.cc, ToggleButtonControl.h, ToggleButtonControl.cc, ToggleTool.h, ToggleTool.cc, ToolBar.h, ToolBar.cc, ToolBarButton.h, ToolBarButton.cc: Accept reference to interpreter in create function and constructors for graphics objects. Eliminate global access to interpreter object and graphics_handle manager.

author	John W. Eaton <jwe@octave.org>
date	Wed, 06 Nov 2019 12:42:12 -0500
parents	028205a91a07
children	b442ec6dda5c

rev	line source
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26276 diff changeset	3 Copyright (C) 2011-2019 Michael Goffioul
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	4
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	5 This file is part of Octave.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	10 (at your option) any later version.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	15 GNU General Public License for more details.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	16
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	19 <https://www.gnu.org/licenses/>.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	20
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21699 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	24 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	26
21912 d92dcbcd7691 prefer C++ wrappers for C standard headers in C++ code John W. Eaton <jwe@octave.org> parents: 21824 diff changeset	27 #include <cstdint>
d92dcbcd7691 prefer C++ wrappers for C standard headers in C++ code John W. Eaton <jwe@octave.org> parents: 21824 diff changeset	28
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29 #include <QApplication>
27254 e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	30 #include <QFontMetrics>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <QThread>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	32
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	33 #include "ButtonGroup.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	34 #include "CheckBoxControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	35 #include "ContextMenu.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	36 #include "EditControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	37 #include "Figure.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	38 #include "ListBoxControl.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "Logger.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	40 #include "Menu.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "Object.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "ObjectProxy.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	43 #include "Panel.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	44 #include "PopupMenuControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	45 #include "PushButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	46 #include "PushTool.h"
27254 e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	47 #include "QtHandlesUtils.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	48 #include "RadioButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	49 #include "SliderControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	50 #include "Table.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	51 #include "TextControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	52 #include "ToggleButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	53 #include "ToggleTool.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	54 #include "ToolBar.h"
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	55 #include "qt-graphics-toolkit.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	56
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	57 #include "octave-qobject.h"
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	58
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	59 #include "event-manager.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	60 #include "graphics.h"
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	61 #include "interpreter.h"
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	62
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	63 //#if INTPTR_MAX == INT32_MAX
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	64 //# define OCTAVE_PTR_TYPE octave_uint32
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	65 //# define OCTAVE_INTPTR_TYPE uint32_t
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	66 //# define OCTAVE_PTR_SCALAR uint32_scalar_value
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	67 //#else
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	68 # define OCTAVE_PTR_TYPE octave_uint64
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	69 # define OCTAVE_INTPTR_TYPE uint64_t
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	70 # define OCTAVE_PTR_SCALAR uint64_scalar_value
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	71 //#endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	72
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	73 namespace QtHandles
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	74 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	75
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	76 static std::string
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	77 toolkitObjectProperty (const graphics_object& go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	78 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	79 if (go.isa ("figure"))
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23795 diff changeset	80 return "__plot_stream__";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	81 else if (go.isa ("uicontrol")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	82 \|\| go.isa ("uipanel")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	83 \|\| go.isa ("uibuttongroup")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	84 \|\| go.isa ("uimenu")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	85 \|\| go.isa ("uicontextmenu")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25799 diff changeset	86 \|\| go.isa ("uitable")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	87 \|\| go.isa ("uitoolbar")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	88 \|\| go.isa ("uipushtool")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	89 \|\| go.isa ("uitoggletool"))
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23795 diff changeset	90 return "__object__";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	91 else
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	92 qCritical ("QtHandles::qt_graphics_toolkit: no __object__ property known for object "
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	93 "of type %s", go.type ().c_str ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	94
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	95 return "";
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	96 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	97
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	98 qt_graphics_toolkit::qt_graphics_toolkit (octave::interpreter& interp,
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	99 octave::base_qobject& oct_qobj)
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	100 : QObject (), base_graphics_toolkit ("qt"), m_interpreter (interp),
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	101 m_octave_qobj (oct_qobj)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	102 {
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	103 // Implemented with a signal/slot connection in order to properly
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	104 // cross from the interpreter thread (where requests to create
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	105 // graphics object are initiated) to the GUI application thread
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	106 // (where they are actually created and displayed).
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	107
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	108 connect (this, SIGNAL (create_object_signal (double)),
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	109 this, SLOT (create_object (double)));
27316 22265a75be74 eliminate static instance of Qt graphics ObjectFactory class John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	110 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	111
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	112 bool
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	113 qt_graphics_toolkit::initialize (const graphics_object& go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	114 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	115 if (go.isa ("figure")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	116 \|\| go.isa ("uicontrol")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	117 \|\| go.isa ("uipanel")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	118 \|\| go.isa ("uibuttongroup")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	119 \|\| go.isa ("uimenu")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	120 \|\| go.isa ("uicontextmenu")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25799 diff changeset	121 \|\| go.isa ("uitable")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	122 \|\| go.isa ("uitoolbar")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	123 \|\| go.isa ("uipushtool")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	124 \|\| go.isa ("uitoggletool"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	125 {
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	126 // FIXME: We need to unlock the mutex here but we have no way to know if
5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	127 // if it was previously locked by this thread, and thus if we should
5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	128 // re-lock it.
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	129
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	130 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	131
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	132 gh_mgr.unlock ();
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	133
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	134 Logger::debug ("qt_graphics_toolkit::initialize %s from thread %08x",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	135 go.type ().c_str (), QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	136
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	137 ObjectProxy *proxy = new ObjectProxy ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	138 graphics_object gObj (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	139
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	140 OCTAVE_PTR_TYPE tmp (reinterpret_cast<OCTAVE_INTPTR_TYPE> (proxy));
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	141 gObj.get_properties ().set (toolkitObjectProperty (go), tmp);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	142
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	143 emit create_object_signal (go.get_handle ().value ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	144
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	145 return true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	146 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	147
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	148 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	149 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	150
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	151 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	152 qt_graphics_toolkit::update (const graphics_object& go, int pId)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	153 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	154 // Rule out obvious properties we want to ignore.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	155 if (pId == figure::properties::ID___PLOT_STREAM__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	156 \|\| pId == uicontrol::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	157 \|\| pId == uipanel::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	158 \|\| pId == uibuttongroup::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	159 \|\| pId == uimenu::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	160 \|\| pId == uicontextmenu::properties::ID___OBJECT__
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25799 diff changeset	161 \|\| pId == uitable::properties::ID___OBJECT__
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	162 \|\| pId == uitoolbar::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	163 \|\| pId == uipushtool::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	164 \|\| pId == uitoggletool::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	165 \|\| pId == base_properties::ID___MODIFIED__)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	166 return;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	167
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	168 Logger::debug ("qt_graphics_toolkit::update %s(%d) from thread %08x",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	169 go.type ().c_str (), pId, QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	170
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	171 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	172
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	173 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	174 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	175 if (go.isa ("uicontrol")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	176 && pId == uicontrol::properties::ID_STYLE)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	177 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	178 // Special case: we need to recreate the control widget
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	179 // associated with the octave graphics_object
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	180
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	181 finalize (go);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	182 initialize (go);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	183 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	184 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	185 proxy->update (pId);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	186 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	187 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	188
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	189 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	190 qt_graphics_toolkit::finalize (const graphics_object& go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	191 {
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	192 // FIXME: We need to unlock the mutex here but we have no way to know if
5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	193 // if it was previously locked by this thread, and thus if we should
5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	194 // re-lock it.
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	195
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	196 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	197
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	198 gh_mgr.unlock ();
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	199
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	200 Logger::debug ("qt_graphics_toolkit::finalize %s from thread %08x",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	201 go.type ().c_str (), QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	202
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	203 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	204
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	205 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	206 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	207 proxy->finalize ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	208 delete proxy;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	209
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	210 graphics_object gObj (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	211
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	212 gObj.get_properties ().set (toolkitObjectProperty (go), Matrix ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	213 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	214 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	215
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	216 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	217 qt_graphics_toolkit::redraw_figure (const graphics_object& go) const
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	218 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	219 if (go.get_properties ().is_visible ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	220 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	221 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	222
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	223 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	224 proxy->redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	225 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	226 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	227
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	228 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	229 qt_graphics_toolkit::show_figure (const graphics_object& go) const
25799 d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	230 {
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	231 if (go.get_properties ().is_visible ())
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	232 {
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	233 ObjectProxy *proxy = toolkitObjectProxy (go);
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	234
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	235 if (proxy)
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	236 proxy->show ();
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	237 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	238 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	239
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	240 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	241 qt_graphics_toolkit::print_figure (const graphics_object& go,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	242 const std::string& term,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	243 const std::string& file_cmd,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	244 const std::string& /debug_file/) const
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	245 {
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	246 ObjectProxy *proxy = toolkitObjectProxy (go);
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	247
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	248 if (proxy)
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	249 proxy->print (QString::fromStdString (file_cmd),
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	250 QString::fromStdString (term));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	251 }
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	252
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	253 uint8NDArray
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	254 qt_graphics_toolkit::get_pixels (const graphics_object& go) const
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	255 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	256 uint8NDArray retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	257
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24687 diff changeset	258 if (go.isa ("figure"))
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	259 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	260 ObjectProxy *proxy = toolkitObjectProxy (go);
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	261
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	262 if (proxy)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	263 retval = proxy->get_pixels ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	264 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	265
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	266 return retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	267 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	268
27254 e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	269 Matrix
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	270 qt_graphics_toolkit::get_text_extent (const graphics_object& go) const
27254 e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	271 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	272 Matrix ext (1, 4, 0.0);
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	273
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	274 if (go.isa ("uicontrol"))
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	275 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	276 octave_value str = go.get ("string");
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	277 if (! str.isempty ())
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	278 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	279 const uicontrol::properties& up =
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	280 dynamic_cast<const uicontrol::properties&> (go.get_properties ());
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	281 Matrix bb = up.get_boundingbox (false);
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	282 QFont font = Utils::computeFont<uicontrol> (up, bb(3));
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	283 QFontMetrics fm (font);
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	284
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	285 QString s;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	286 QSize sz;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	287
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	288 if (str.is_string ())
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	289 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	290 s = QString::fromStdString (str.string_value ());
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	291 sz = fm.size (Qt::TextSingleLine, s);
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	292 ext(2) = sz.width ();
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	293 ext(3) = sz.height ();
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	294 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	295 else if (str.iscellstr ())
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	296 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	297 string_vector sv = str.string_vector_value ();
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	298 double wd = 0.0;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	299 double hg = 0.0;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	300 for (octave_idx_type ii = 0; ii < sv.numel (); ii++)
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	301 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	302 s = QString::fromStdString (sv(ii));
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	303 sz = fm.size (Qt::TextSingleLine, s);
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	304 wd = std::max (wd, static_cast<double> (sz.width ()));
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	305 hg = std::max (hg, static_cast<double> (sz.height ()));
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	306 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	307
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	308 ext(2) = wd;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	309 // FIXME: Find a better way to determine the height of e.g.
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	310 // listbox uicontrol objects
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	311 ext(3) = hg * sv.numel ();
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	312 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	313 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	314 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	315
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	316 return ext;
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	317 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	318
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	319 Object*
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	320 qt_graphics_toolkit::toolkitObject (const graphics_object& go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	321 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	322 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	323
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	324 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	325 return proxy->object ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	326
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23577 diff changeset	327 return nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	328 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	329
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	330 ObjectProxy*
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	331 qt_graphics_toolkit::toolkitObjectProxy (const graphics_object& go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	332 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	333 if (go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	334 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	335 octave_value ov = go.get (toolkitObjectProperty (go));
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	336
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	337 if (ov.is_defined () && ! ov.isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	338 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	339 OCTAVE_INTPTR_TYPE ptr = ov.OCTAVE_PTR_SCALAR ().value ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	340
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	341 return reinterpret_cast<ObjectProxy *> (ptr);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	342 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	343 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	344
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23577 diff changeset	345 return nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	346 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	347
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	348 void
718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	349 qt_graphics_toolkit::interpreter_event (const octave::fcn_callback& fcn)
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	350 {
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	351 octave::event_manager& evmgr = m_interpreter.get_event_manager ();
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	352
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	353 evmgr.post_event (fcn);
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	354 }
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	355
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	356 void
718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	357 qt_graphics_toolkit::interpreter_event (const octave::meth_callback& meth)
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	358 {
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	359 octave::event_manager& evmgr = m_interpreter.get_event_manager ();
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	360
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	361 evmgr.post_event (meth);
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	362 }
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	363
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	364 void
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	365 qt_graphics_toolkit::create_object (double handle)
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	366 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	367 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	368
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	369 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	370
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	371 graphics_object go (gh_mgr.get_object (graphics_handle (handle)));
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	372
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	373 if (! go.valid_object ())
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	374 {
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	375 qWarning ("qt_graphics_toolkit::create_object: invalid object for handle %g",
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	376 handle);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	377 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	378 }
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	379
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	380 if (go.get_properties ().is_beingdeleted ())
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	381 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	382 qWarning ("qt_graphics_toolkit::create_object: object is being deleted");
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	383 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	384 }
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	385
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	386 ObjectProxy *proxy = qt_graphics_toolkit::toolkitObjectProxy (go);
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	387
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	388 if (! proxy)
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	389 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	390 qWarning ("qt_graphics_toolkit::create_object: no proxy for handle %g",
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	391 handle);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	392 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	393 }
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	394
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	395 Logger::debug ("qt_graphics_toolkit::create_object: "
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	396 "create %s from thread %08x",
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	397 go.type ().c_str (), QThread::currentThreadId ());
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	398
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	399 Object *obj = nullptr;
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	400
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	401 if (go.isa ("figure"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	402 obj = Figure::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	403 else if (go.isa ("uicontrol"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	404 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	405 uicontrol::properties& up =
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	406 Utils::properties<uicontrol> (go);
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	407
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	408 if (up.style_is ("pushbutton"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	409 obj = PushButtonControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	410 else if (up.style_is ("edit"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	411 obj = EditControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	412 else if (up.style_is ("checkbox"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	413 obj = CheckBoxControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	414 else if (up.style_is ("radiobutton"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	415 obj = RadioButtonControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	416 else if (up.style_is ("togglebutton"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	417 obj = ToggleButtonControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	418 else if (up.style_is ("text"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	419 obj = TextControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	420 else if (up.style_is ("popupmenu"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	421 obj = PopupMenuControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	422 else if (up.style_is ("slider"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	423 obj = SliderControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	424 else if (up.style_is ("listbox"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	425 obj = ListBoxControl::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	426 }
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	427 else if (go.isa ("uibuttongroup"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	428 obj = ButtonGroup::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	429 else if (go.isa ("uipanel"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	430 obj = Panel::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	431 else if (go.isa ("uimenu"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	432 obj = Menu::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	433 else if (go.isa ("uicontextmenu"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	434 obj = ContextMenu::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	435 else if (go.isa ("uitable"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	436 obj = Table::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	437 else if (go.isa ("uitoolbar"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	438 obj = ToolBar::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	439 else if (go.isa ("uipushtool"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	440 obj = PushTool::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	441 else if (go.isa ("uitoggletool"))
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	442 obj = ToggleTool::create (m_octave_qobj, m_interpreter, go);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	443 else
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	444 qWarning ("qt_graphics_toolkit::create_object: unsupported type '%s'",
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	445 go.type ().c_str ());
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	446
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	447 if (obj)
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	448 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	449 proxy->setObject (obj);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	450 obj->do_connections (this);
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	451 }
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	452 }
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	453
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	454 void qt_graphics_toolkit::gh_callback_event (const graphics_handle& h,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	455 const std::string& nm)
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	456 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	457 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	458
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	459 gh_mgr.post_callback (h, nm);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	460 }
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	461
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	462 void qt_graphics_toolkit::gh_callback_event (const graphics_handle& h,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	463 const std::string& nm,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	464 const octave_value& data)
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	465 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	466 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	467
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	468 gh_mgr.post_callback (h, nm, data);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	469 }
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	470
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	471 void qt_graphics_toolkit::gh_set_event (const graphics_handle& h,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	472 const std::string& nm,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	473 const octave_value& value)
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	474 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	475 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	476
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	477 gh_mgr.post_set (h, nm, value);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	478 }
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	479
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	480 void qt_graphics_toolkit::gh_set_event (const graphics_handle& h,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	481 const std::string& nm,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	482 const octave_value& value,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	483 bool notify_toolkit)
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	484 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	485 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	486
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	487 gh_mgr.post_set (h, nm, value, notify_toolkit);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	488 }
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	489
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	490 void qt_graphics_toolkit::gh_set_event (const graphics_handle& h,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	491 const std::string& nm,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	492 const octave_value& value,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	493 bool notify_toolkit,
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	494 bool redraw_figure)
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	495 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	496 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	497
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	498 gh_mgr.post_set (h, nm, value, notify_toolkit, redraw_figure);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27318 diff changeset	499 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	500 };

Mercurial > octave

annotate libgui/graphics/qt-graphics-toolkit.cc @ 27647:2a506bc4a7af