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

annotate libgui/graphics/qt-graphics-toolkit.cc @ 31649:deb553ac2c54

maint: Merge stable to default.

author	John W. Eaton <jwe@octave.org>
date	Tue, 06 Dec 2022 15:45:27 -0500
parents	431f80aba37a 29d734430e5f
children	5f11de0e7440

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30398 diff changeset	3 // Copyright (C) 2011-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21699 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29
21912 d92dcbcd7691 prefer C++ wrappers for C standard headers in C++ code John W. Eaton <jwe@octave.org> parents: 21824 diff changeset	30 #include <cstdint>
d92dcbcd7691 prefer C++ wrappers for C standard headers in C++ code John W. Eaton <jwe@octave.org> parents: 21824 diff changeset	31
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	32 #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	33 #include <QFontMetrics>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QThread>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	35
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	36 #include "ButtonGroup.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	37 #include "CheckBoxControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	38 #include "ContextMenu.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	39 #include "EditControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	40 #include "Figure.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	41 #include "ListBoxControl.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "Logger.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	43 #include "Menu.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include "Object.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "ObjectProxy.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	46 #include "Panel.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	47 #include "PopupMenuControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	48 #include "PushButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	49 #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	50 #include "QtHandlesUtils.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	51 #include "RadioButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	52 #include "SliderControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	53 #include "Table.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	54 #include "TextControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	55 #include "ToggleButtonControl.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	56 #include "ToggleTool.h"
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	57 #include "ToolBar.h"
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	58 #include "qt-graphics-toolkit.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	59
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	60 #include "event-manager.h"
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	61 #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	62 #include "interpreter.h"
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	63
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	64 //#if INTPTR_MAX == INT32_MAX
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	65 //# define OCTAVE_PTR_TYPE octave_uint32
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	66 //# define OCTAVE_INTPTR_TYPE uint32_t
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	67 //# define OCTAVE_PTR_SCALAR uint32_scalar_value
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	68 //#else
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	69 # define OCTAVE_PTR_TYPE octave_uint64
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	70 # define OCTAVE_INTPTR_TYPE uint64_t
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	71 # define OCTAVE_PTR_SCALAR uint64_scalar_value
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	72 //#endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	73
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	74 OCTAVE_BEGIN_NAMESPACE(octave)
18498 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
29992 6ea4a84df9c7 rename QtHandles namespace to octave John W. Eaton <jwe@octave.org> parents: 29602 diff changeset	92 qCritical ("octave::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
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	98 qt_graphics_toolkit::qt_graphics_toolkit (octave::interpreter& interp)
ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	99 : QObject (), base_graphics_toolkit ("qt"), m_interpreter (interp)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	100 {
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	101 // 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	102 // 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	103 // 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	104 // (where they are actually created and displayed).
28395 a379987a74b0 Make sure Objects and their proxy are initialized synchronously (bug #55225) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27935 diff changeset	105 // We need to make sure the GUI Object and its proxy are properly
a379987a74b0 Make sure Objects and their proxy are initialized synchronously (bug #55225) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27935 diff changeset	106 // created before the initialize method returns, so we use a
a379987a74b0 Make sure Objects and their proxy are initialized synchronously (bug #55225) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27935 diff changeset	107 // BlockingQueuedConnection. After the signal is emitted, the interpreter
a379987a74b0 Make sure Objects and their proxy are initialized synchronously (bug #55225) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27935 diff changeset	108 // thread is locked until the slot has returned.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	109
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	110 connect (this, &qt_graphics_toolkit::create_object_signal,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	111 this, &qt_graphics_toolkit::create_object,
28395 a379987a74b0 Make sure Objects and their proxy are initialized synchronously (bug #55225) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27935 diff changeset	112 Qt::BlockingQueuedConnection);
27316 22265a75be74 eliminate static instance of Qt graphics ObjectFactory class John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	113 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	114
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	115 bool
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	116 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	117 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	118 if (go.isa ("figure")
28474 4539c931734a Stop error when deleting uicontrol "frame" objects (bug #58544). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28395 diff changeset	119 \|\| (go.isa ("uicontrol") && go.get ("style").string_value () != "frame")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	120 \|\| go.isa ("uipanel")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	121 \|\| go.isa ("uibuttongroup")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	122 \|\| go.isa ("uimenu")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	123 \|\| go.isa ("uicontextmenu")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25799 diff changeset	124 \|\| go.isa ("uitable")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	125 \|\| go.isa ("uitoolbar")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	126 \|\| go.isa ("uipushtool")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	127 \|\| go.isa ("uitoggletool"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	128 {
28474 4539c931734a Stop error when deleting uicontrol "frame" objects (bug #58544). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28395 diff changeset	129 // FIXME: We need to unlock the mutex here but we have no way to know
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	130 // 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	131 // re-lock it.
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	132
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	133 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	134
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	135 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	136
29602 767cda46e091 qt-graphics-toolkit.cc: Use correct format specifier for "void " type. Markus Mützel <markus.muetzel@gmx.de>* parents: 29542 diff changeset	137 Logger::debug ("qt_graphics_toolkit::initialize %s from thread %p",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	138 go.type ().c_str (), QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	139
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	140 ObjectProxy *proxy = new ObjectProxy ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	141 graphics_object gObj (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	142
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	143 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	144 gObj.get_properties ().set (toolkitObjectProperty (go), tmp);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	145
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	146 emit create_object_signal (go.get_handle ().value ());
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 true;
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 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	152 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	153
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	154 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	155 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	156 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	157 // Rule out obvious properties we want to ignore.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	158 if (pId == figure::properties::ID___PLOT_STREAM__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	159 \|\| pId == uicontrol::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	160 \|\| pId == uipanel::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	161 \|\| pId == uibuttongroup::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	162 \|\| pId == uimenu::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	163 \|\| pId == uicontextmenu::properties::ID___OBJECT__
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25799 diff changeset	164 \|\| pId == uitable::properties::ID___OBJECT__
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	165 \|\| pId == uitoolbar::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	166 \|\| pId == uipushtool::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	167 \|\| pId == uitoggletool::properties::ID___OBJECT__
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	168 \|\| pId == base_properties::ID___MODIFIED__)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	169 return;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	170
29602 767cda46e091 qt-graphics-toolkit.cc: Use correct format specifier for "void " type. Markus Mützel <markus.muetzel@gmx.de>* parents: 29542 diff changeset	171 Logger::debug ("qt_graphics_toolkit::update %s(%d) from thread %p",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	172 go.type ().c_str (), pId, QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	173
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	174 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	175
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	176 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	177 {
31585 7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	178 if ((go.isa ("uicontrol")
7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	179 && pId == uicontrol::properties::ID_STYLE)
7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	180 \|\| (go.isa ("uitable")
7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	181 && pId == uitable::properties::ID_DATA))
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	182 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	183 // 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	184 // associated with the octave graphics_object
31585 7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	185 // FIXME: For uitable, it would only be necessary to recreate
7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	186 // the table widget if the type of the displayed values changes
7d7e04fc21ba uitable: Avoid crash with Boolean values (bug #63388). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	187 // between Boolean and non-Boolean (bug #63388).
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 finalize (go);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	190 initialize (go);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	191 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	192 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	193 proxy->update (pId);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	194 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	195 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	196
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	197 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	198 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	199 {
26276 5535267e88ba Make creation and destruction of Qt widgets synchronous (bug #55526) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26112 diff changeset	200 // 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	201 // 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	202 // re-lock it.
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	203
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	204 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	205
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	206 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	207
29602 767cda46e091 qt-graphics-toolkit.cc: Use correct format specifier for "void " type. Markus Mützel <markus.muetzel@gmx.de>* parents: 29542 diff changeset	208 Logger::debug ("qt_graphics_toolkit::finalize %s from thread %p",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	209 go.type ().c_str (), QThread::currentThreadId ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	210
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	211 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	212
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	213 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	214 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	215 proxy->finalize ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	216 delete proxy;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	217
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	218 graphics_object gObj (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	219
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	220 gObj.get_properties ().set (toolkitObjectProperty (go), Matrix ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	221 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	222 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	223
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	224 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	225 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	226 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	227 if (go.get_properties ().is_visible ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	228 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	229 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	230
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	231 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	232 proxy->redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	233 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	234 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	235
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	236 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	237 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	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 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	240 {
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	241 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	242
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	243 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	244 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	245 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	246 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	247
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	248 void
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	249 qt_graphics_toolkit::print_figure (const graphics_object& go,
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	250 const std::string& term,
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	251 const std::string& file_cmd,
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	252 const std::string& /debug_file/) const
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	253 {
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	254 ObjectProxy *proxy = toolkitObjectProxy (go);
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	255
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	256 if (proxy)
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	257 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	258 QString::fromStdString (term));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	259 }
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	260
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	261 uint8NDArray
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	262 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	263 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	264 uint8NDArray retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	265
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24687 diff changeset	266 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	267 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	268 ObjectProxy *proxy = toolkitObjectProxy (go);
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	269
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	270 if (proxy)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	271 retval = proxy->get_pixels ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	272 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	273
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	274 return retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	275 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	276
27254 e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	277 Matrix
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	278 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	279 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	280 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	281
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	282 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	283 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	284 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	285 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	286 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	287 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	288 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	289 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	290 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	291 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	292
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	293 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	294 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	295
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	296 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	297 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	298 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	299 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	300 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	301 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	302 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	303 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	304 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	305 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	306 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	307 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	308 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	309 {
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	310 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	311 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	312 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	313 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	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 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	317 // 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	318 // 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	319 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	320 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	321 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	322 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	323
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	324 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	325 }
e3d886685813 Let graphics toolkit compute the extent of uicontrol text strings (bug #48446) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	326
30398 d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29992 diff changeset	327 Object *
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	328 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	329 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	330 ObjectProxy *proxy = toolkitObjectProxy (go);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	331
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	332 if (proxy)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	333 return proxy->object ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	334
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23577 diff changeset	335 return nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	336 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	337
30398 d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29992 diff changeset	338 ObjectProxy *
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	339 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	340 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	341 if (go)
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 octave_value ov = go.get (toolkitObjectProperty (go));
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	344
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	345 if (ov.is_defined () && ! ov.isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	346 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	347 OCTAVE_INTPTR_TYPE ptr = ov.OCTAVE_PTR_SCALAR ().value ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	348
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	349 return reinterpret_cast<ObjectProxy *> (ptr);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	350 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	351 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	352
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23577 diff changeset	353 return nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	354 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: 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::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	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 (fcn);
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	362 }
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	363
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	364 void
718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27316 diff changeset	365 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	366 {
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	367 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	368
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27254 diff changeset	369 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	370 }
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	371
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	372 void
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	373 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	374 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	375 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	376
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	377 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	378
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	379 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	380
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	381 if (! go.valid_object ())
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	382 {
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	383 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	384 handle);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	385 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	386 }
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	387
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	388 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	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: 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	391 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	392 }
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	393
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	394 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	395
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	396 if (! proxy)
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	397 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	398 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	399 handle);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	400 return;
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	401 }
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	402
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	403 Logger::debug ("qt_graphics_toolkit::create_object: "
29602 767cda46e091 qt-graphics-toolkit.cc: Use correct format specifier for "void " type. Markus Mützel <markus.muetzel@gmx.de>* parents: 29542 diff changeset	404 "create %s from thread %p",
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	405 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	406
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	407 Object *obj = nullptr;
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	408
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	409 if (go.isa ("figure"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	410 obj = Figure::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	411 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	412 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	413 uicontrol::properties& up =
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	414 Utils::properties<uicontrol> (go);
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	415
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	416 if (up.style_is ("pushbutton"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	417 obj = PushButtonControl::create (m_interpreter, go);
27647 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 ("edit"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	419 obj = EditControl::create (m_interpreter, go);
27647 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 ("checkbox"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	421 obj = CheckBoxControl::create (m_interpreter, go);
27647 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 ("radiobutton"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	423 obj = RadioButtonControl::create (m_interpreter, go);
27647 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 ("togglebutton"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	425 obj = ToggleButtonControl::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	426 else if (up.style_is ("text"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	427 obj = TextControl::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	428 else if (up.style_is ("popupmenu"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	429 obj = PopupMenuControl::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	430 else if (up.style_is ("slider"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	431 obj = SliderControl::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	432 else if (up.style_is ("listbox"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	433 obj = ListBoxControl::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	434 }
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 ("uibuttongroup"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	436 obj = ButtonGroup::create (m_interpreter, go);
27647 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 ("uipanel"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	438 obj = Panel::create (m_interpreter, go);
27647 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 ("uimenu"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	440 obj = Menu::create (m_interpreter, go);
27647 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 ("uicontextmenu"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	442 obj = ContextMenu::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	443 else if (go.isa ("uitable"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	444 obj = Table::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	445 else if (go.isa ("uitoolbar"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	446 obj = ToolBar::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	447 else if (go.isa ("uipushtool"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	448 obj = PushTool::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	449 else if (go.isa ("uitoggletool"))
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	450 obj = ToggleTool::create (m_interpreter, go);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	451 else
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	452 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	453 go.type ().c_str ());
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	454
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	455 if (obj)
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	456 {
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	457 proxy->setObject (obj);
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	458 obj->do_connections (this);
27318 ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	459 }
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	460 }
ae53e56e16f2 eliminate separate ObjectFactory class in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	461
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	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 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	465 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	466
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	467 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	468 }
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 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	471 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	472 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	473 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	474 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	475
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	476 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	477 }
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 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	480 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	481 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	482 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	483 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	484
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	485 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	486 }
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	487
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 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	489 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	490 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	491 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	492 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	493 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	494
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	495 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	496 }
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	497
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	498 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	499 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	500 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	501 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	502 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	503 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	504 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	505
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	506 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	507 }
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	508
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31585 diff changeset	509 OCTAVE_END_NAMESPACE(octave);

Mercurial > octave

annotate libgui/graphics/qt-graphics-toolkit.cc @ 31649:deb553ac2c54