octave: libgui/graphics/ButtonGroup.cc annotate

annotate libgui/graphics/ButtonGroup.cc @ 27919:1891570abac8

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2020.

author	John W. Eaton <jwe@octave.org>
date	Mon, 06 Jan 2020 22:29:51 -0500
parents	b442ec6dda5c
children	bd51beb6205e

rev	line source
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	1 /*
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	2
27919 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27918 diff changeset	3 Copyright (C) 2016-2020 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27677 diff changeset	4
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27677 diff changeset	5 See the file COPYRIGHT.md in the top-level directory of this distribution
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27677 diff changeset	6 or <https://octave.org/COPYRIGHT.html/>.
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27677 diff changeset	7
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	8
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	9 This file is part of Octave.
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	10
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	11 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	12 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: 23795 diff changeset	13 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	14 (at your option) any later version.
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	15
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	16 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	17 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	19 GNU General Public License for more details.
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	20
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	21 You should have received a copy of the GNU General Public License
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	22 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: 23795 diff changeset	23 <https://www.gnu.org/licenses/>.
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	24
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	25 */
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	26
22188 1344509a480c style fixes John W. Eaton <jwe@octave.org> parents: 21824 diff changeset	27 #if defined (HAVE_CONFIG_H)
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	28 # include "config.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	29 #endif
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	30
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	31 #include <QAbstractButton>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	32 #include <QButtonGroup>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	33 #include <QEvent>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	34 #include <QFrame>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	35 #include <QLabel>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	36 #include <QMouseEvent>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	37 #include <QRadioButton>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	38 #include <QTimer>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	39
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	40 #include "Canvas.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	41 #include "Container.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	42 #include "ContextMenu.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	43 #include "ButtonGroup.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	44 #include "ToggleButtonControl.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	45 #include "RadioButtonControl.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	46 #include "QtHandlesUtils.h"
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	47 #include "qt-graphics-toolkit.h"
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	48
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	49 #include "octave-qobject.h"
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	50
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	51 #include "interpreter.h"
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	52 #include "ov-struct.h"
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	53
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	54 namespace QtHandles
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	55 {
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	56
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	57 static int
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	58 frameStyleFromProperties (const uibuttongroup::properties& pp)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	59 {
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	60 if (pp.bordertype_is ("none"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	61 return QFrame::NoFrame;
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	62 else if (pp.bordertype_is ("etchedin"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	63 return (QFrame::Box \| QFrame::Sunken);
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	64 else if (pp.bordertype_is ("etchedout"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	65 return (QFrame::Box \| QFrame::Raised);
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	66 else if (pp.bordertype_is ("beveledin"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	67 return (QFrame::Panel \| QFrame::Sunken);
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	68 else if (pp.bordertype_is ("beveledout"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	69 return (QFrame::Panel \| QFrame::Raised);
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	70 else
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	71 return (QFrame::Panel \| QFrame::Plain);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	72 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	73
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	74 static void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23223 diff changeset	75 setupPalette (const uibuttongroup::properties& pp, QPalette& p)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	76 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	77 p.setColor (QPalette::Window,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	78 Utils::fromRgb (pp.get_backgroundcolor_rgb ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	79 p.setColor (QPalette::WindowText,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	80 Utils::fromRgb (pp.get_foregroundcolor_rgb ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	81 p.setColor (QPalette::Light,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	82 Utils::fromRgb (pp.get_highlightcolor_rgb ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	83 p.setColor (QPalette::Dark,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	84 Utils::fromRgb (pp.get_shadowcolor_rgb ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	85 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	86
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	87 static int
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	88 borderWidthFromProperties (const uibuttongroup::properties& pp)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	89 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	90 int bw = 0;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	91
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	92 if (! pp.bordertype_is ("none"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	93 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	94 bw = octave::math::round (pp.get_borderwidth ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	95 if (pp.bordertype_is ("etchedin") \|\| pp.bordertype_is ("etchedout"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	96 bw *= 2;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	97 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	98
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	99 return bw;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	100 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	101
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	102 ButtonGroup*
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	103 ButtonGroup::create (octave::base_qobject& oct_qobj,
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	104 octave::interpreter& interp, const graphics_object& go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	105 {
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	106 Object *parent = parentObject (interp, go);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	107
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	108 if (parent)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	109 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	110 Container *container = parent->innerContainer ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	111
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	112 if (container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	113 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	114 QFrame *frame = new QFrame (container);
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	115 return new ButtonGroup (oct_qobj, interp, go,
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	116 new QButtonGroup (frame), frame);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	117 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	118 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	119
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23449 diff changeset	120 return nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	121 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	122
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	123 ButtonGroup::ButtonGroup (octave::base_qobject& oct_qobj,
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	124 octave::interpreter& interp,
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	125 const graphics_object& go,
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	126 QButtonGroup buttongroup, QFrame frame)
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	127 : Object (oct_qobj, interp, go, frame), m_hiddenbutton (nullptr),
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	128 m_container (nullptr), m_title (nullptr), m_blockUpdates (false)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	129 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	130 uibuttongroup::properties& pp = properties<uibuttongroup> ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	131
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	132 frame->setObjectName ("UIButtonGroup");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	133 frame->setAutoFillBackground (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	134 Matrix bb = pp.get_boundingbox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	135 frame->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	136 octave::math::round (bb(2)), octave::math::round (bb(3)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	137 frame->setFrameStyle (frameStyleFromProperties (pp));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	138 frame->setLineWidth (octave::math::round (pp.get_borderwidth ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	139 QPalette pal = frame->palette ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	140 setupPalette (pp, pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	141 frame->setPalette (pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	142 m_buttongroup = buttongroup;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	143 m_hiddenbutton = new QRadioButton (frame);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	144 m_hiddenbutton->hide ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	145 m_buttongroup->addButton (m_hiddenbutton);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	146
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	147 m_container = new Container (frame, oct_qobj, interp);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	148 m_container->canvas (m_handle);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	149
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	150 connect (m_container, SIGNAL (interpeter_event (const fcn_callback&)),
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	151 this, SIGNAL (interpeter_event (const fcn_callback&)));
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	152
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	153 connect (m_container, SIGNAL (interpeter_event (const meth_callback&)),
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	154 this, SIGNAL (interpeter_event (const meth_callback&)));
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	155
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	156 if (frame->hasMouseTracking ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	157 {
27677 92fea2cd024f use standard C++ range-based for loops instead of Qt foreach macro John W. Eaton <jwe@octave.org> parents: 27647 diff changeset	158 for (auto w : frame->findChildren<QWidget> ())
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	159 w->setMouseTracking (true);
27677 92fea2cd024f use standard C++ range-based for loops instead of Qt foreach macro John W. Eaton <jwe@octave.org> parents: 27647 diff changeset	160 for (auto w : buttongroup->findChildren<QWidget> ())
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	161 w->setMouseTracking (true);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	162 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	163
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	164 QString title = Utils::fromStdString (pp.get_title ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	165 if (! title.isEmpty ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	166 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	167 m_title = new QLabel (title, frame);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	168 m_title->setAutoFillBackground (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	169 m_title->setContentsMargins (4, 0, 4, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	170 m_title->setPalette (pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	171 m_title->setFont (Utils::computeFont<uibuttongroup> (pp, bb(3)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	172 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	173
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	174 frame->installEventFilter (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	175 m_container->installEventFilter (this);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	176
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	177 if (pp.is_visible ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	178 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	179 QTimer::singleShot (0, frame, SLOT (show (void)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	180 QTimer::singleShot (0, buttongroup, SLOT (show (void)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	181 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	182 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	183 frame->hide ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	184
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	185 connect (m_buttongroup, SIGNAL (buttonClicked (QAbstractButton*)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	186 SLOT (buttonClicked (QAbstractButton*)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	187 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	188
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	189 ButtonGroup::~ButtonGroup (void)
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22411 diff changeset	190 { }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	191
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	192 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	193 ButtonGroup::eventFilter (QObject watched, QEvent xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	194 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	195 if (! m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	196 {
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	197 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	198
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	199 if (watched == qObject ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	200 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	201 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	202 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	203 case QEvent::Resize:
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	204 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	205 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	206
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	207 graphics_object go = object ();
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	208
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	209 if (go.valid_object ())
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	210 {
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	211 if (m_title)
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	212 {
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	213 const uibuttongroup::properties& pp =
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	214 Utils::properties<uibuttongroup> (go);
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	215
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	216 if (pp.fontunits_is ("normalized"))
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	217 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	218 QFrame *frame = qWidget<QFrame> ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	219
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	220 m_title->setFont (Utils::computeFont<uibuttongroup>
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	221 (pp, frame->height ()));
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	222 m_title->resize (m_title->sizeHint ());
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	223 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	224 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	225 updateLayout ();
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	226 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	227 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	228 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	229
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	230 case QEvent::MouseButtonPress:
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	231 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	232 QMouseEvent m = dynamic_cast<QMouseEvent > (xevent);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	233
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	234 if (m->button () == Qt::RightButton)
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	235 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	236 octave::autolock guard (gh_mgr.graphics_lock ());
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	237
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	238 ContextMenu::executeAt (m_interpreter, properties (),
2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	239 m->globalPos ());
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	240 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	241 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	242 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	243
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	244 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	245 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	246 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	247 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	248 else if (watched == m_container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	249 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	250 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	251 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	252 case QEvent::Resize:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	253 if (qWidget<QWidget> ()->isVisible ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	254 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	255 octave::autolock guard (gh_mgr.graphics_lock ());
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	256
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	257 properties ().update_boundingbox ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	258 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	259 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	260
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	261 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	262 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	263 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	264 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	265 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	266
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	267 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	268 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	269
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	270 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	271 ButtonGroup::update (int pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	272 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	273 uibuttongroup::properties& pp = properties<uibuttongroup> ();
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	274 QFrame *frame = qWidget<QFrame> ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	275
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	276 m_blockUpdates = true;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	277
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	278 switch (pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	279 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	280 case uibuttongroup::properties::ID_POSITION:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	281 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	282 Matrix bb = pp.get_boundingbox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	283
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	284 frame->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	285 octave::math::round (bb(2)), octave::math::round (bb(3)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	286 updateLayout ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	287 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	288 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	289
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	290 case uibuttongroup::properties::ID_BORDERWIDTH:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	291 frame->setLineWidth (octave::math::round (pp.get_borderwidth ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	292 updateLayout ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	293 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	294
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	295 case uibuttongroup::properties::ID_BACKGROUNDCOLOR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	296 case uibuttongroup::properties::ID_FOREGROUNDCOLOR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	297 case uibuttongroup::properties::ID_HIGHLIGHTCOLOR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	298 case uibuttongroup::properties::ID_SHADOWCOLOR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	299 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	300 QPalette pal = frame->palette ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	301
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	302 setupPalette (pp, pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	303 frame->setPalette (pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	304 if (m_title)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	305 m_title->setPalette (pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	306 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	307 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	308
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	309 case uibuttongroup::properties::ID_TITLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	310 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	311 QString title = Utils::fromStdString (pp.get_title ());
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	312
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	313 if (title.isEmpty ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	314 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	315 if (m_title)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	316 delete m_title;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23449 diff changeset	317 m_title = nullptr;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	318 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	319 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	320 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	321 if (! m_title)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	322 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	323 QPalette pal = frame->palette ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	324
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	325 m_title = new QLabel (title, frame);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	326 m_title->setAutoFillBackground (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	327 m_title->setContentsMargins (4, 0, 4, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	328 m_title->setPalette (pal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	329 m_title->setFont (Utils::computeFont<uibuttongroup> (pp));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	330 m_title->show ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	331 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	332 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	333 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	334 m_title->setText (title);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	335 m_title->resize (m_title->sizeHint ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	336 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	337 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	338 updateLayout ();
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	339 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	340 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	341
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	342 case uibuttongroup::properties::ID_TITLEPOSITION:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	343 updateLayout ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	344 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	345
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	346 case uibuttongroup::properties::ID_BORDERTYPE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	347 frame->setFrameStyle (frameStyleFromProperties (pp));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	348 updateLayout ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	349 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	350
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	351 case uibuttongroup::properties::ID_FONTNAME:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	352 case uibuttongroup::properties::ID_FONTSIZE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	353 case uibuttongroup::properties::ID_FONTWEIGHT:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	354 case uibuttongroup::properties::ID_FONTANGLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	355 if (m_title)
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	356 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	357 m_title->setFont (Utils::computeFont<uibuttongroup> (pp));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	358 m_title->resize (m_title->sizeHint ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	359 updateLayout ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	360 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	361 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	362
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	363 case uibuttongroup::properties::ID_VISIBLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	364 frame->setVisible (pp.is_visible ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	365 updateLayout ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	366 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	367
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	368 case uibuttongroup::properties::ID_SELECTEDOBJECT:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	369 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	370 graphics_handle h = pp.get_selectedobject ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	371
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	372 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	373
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	374 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	375
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	376 graphics_object go = gh_mgr.get_object (h);
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	377
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	378 Object *selectedObject = qt_graphics_toolkit::toolkitObject (go);
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	379 ToggleButtonControl toggle = static_cast<ToggleButtonControl >
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	380 (selectedObject);
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	381 RadioButtonControl radio = static_cast<RadioButtonControl >(selectedObject);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	382 if (toggle)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	383 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	384 go.get_properties ().set ("value", 1);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	385 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	386 else if (radio)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	387 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	388 go.get_properties ().set ("value", 1);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	389 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	390 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	391 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	392 m_hiddenbutton->setChecked (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	393 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	394 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	395 break;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	396
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	397 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	398 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	399 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	400
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	401 m_blockUpdates = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	402 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	403
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	404 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	405 ButtonGroup::redraw (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	406 {
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	407 update (uibuttongroup::properties::ID_POSITION);
92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	408
92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	409 // FIXME: is it really necessary to update the opengl canvas here?
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	410 Canvas *canvas = m_container->canvas (m_handle);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	411
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	412 if (canvas)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	413 canvas->redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	414 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	415
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	416 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	417 ButtonGroup::updateLayout (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	418 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	419 uibuttongroup::properties& pp = properties<uibuttongroup> ();
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	420 QFrame *frame = qWidget<QFrame> ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	421
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	422 Matrix bb = pp.get_boundingbox (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	423 int bw = borderWidthFromProperties (pp);
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	424
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	425 frame->setFrameRect (QRect (octave::math::round (bb(0)) - bw,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	426 octave::math::round (bb(1)) - bw,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	427 octave::math::round (bb(2)) + 2bw, octave::math::round (bb(3)) + 2bw));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	428 m_container->setGeometry (octave::math::round (bb(0)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	429 octave::math::round (bb(1)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	430 octave::math::round (bb(2)), octave::math::round (bb(3)));
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	431
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	432 if (m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	433 pp.update_boundingbox ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	434
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	435 if (m_title)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	436 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	437 QSize sz = m_title->sizeHint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	438 int offset = 5;
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	439
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	440 if (pp.titleposition_is ("lefttop"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	441 m_title->move (bw+offset, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	442 else if (pp.titleposition_is ("righttop"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	443 m_title->move (frame->width () - bw - offset - sz.width (), 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	444 else if (pp.titleposition_is ("leftbottom"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	445 m_title->move (bw+offset, frame->height () - sz.height ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	446 else if (pp.titleposition_is ("rightbottom"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	447 m_title->move (frame->width () - bw - offset - sz.width (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	448 frame->height () - sz.height ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	449 else if (pp.titleposition_is ("centertop"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	450 m_title->move (frame->width () / 2 - sz.width () / 2, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	451 else if (pp.titleposition_is ("centerbottom"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	452 m_title->move (frame->width () / 2 - sz.width () / 2,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	453 frame->height () - sz.height ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	454 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	455 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	456
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	457 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	458 ButtonGroup::selectNothing (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	459 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	460 m_hiddenbutton->setChecked (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	461 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	462
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	463
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	464 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	465 ButtonGroup::addButton (QAbstractButton *btn)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	466 {
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	467 m_buttongroup->addButton (btn);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	468 connect (btn, SIGNAL (toggled (bool)), SLOT (buttonToggled (bool)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	469 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	470
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	471 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	472 ButtonGroup::buttonToggled (bool toggled)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	473 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	474 Q_UNUSED (toggled);
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22417 diff changeset	475 if (! m_blockUpdates)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	476 {
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	477 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	478
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	479 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	480
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	481 uibuttongroup::properties& bp = properties<uibuttongroup> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	482
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	483 graphics_handle oldValue = bp.get_selectedobject ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	484
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	485 QAbstractButton *checkedBtn = m_buttongroup->checkedButton ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	486
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	487 graphics_handle newValue = graphics_handle ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	488 if (checkedBtn != m_hiddenbutton)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	489 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	490 Object *checkedObj = Object::fromQObject (checkedBtn);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	491 newValue = checkedObj->properties ().get___myhandle__ ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	492 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	493
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	494 if (oldValue != newValue)
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	495 emit gh_set_event (m_handle, "selectedobject",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	496 newValue.as_octave_value (), false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	497 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	498 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	499
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	500 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	501 ButtonGroup::buttonClicked (QAbstractButton *btn)
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	502 {
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	503 Q_UNUSED (btn);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	504
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	505 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	506
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	507 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	508
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	509 uibuttongroup::properties& bp = properties<uibuttongroup> ();
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	510
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	511 graphics_handle oldValue = bp.get_selectedobject ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	512
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	513 QAbstractButton *checkedBtn = m_buttongroup->checkedButton ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	514 Object *checkedObj = Object::fromQObject (checkedBtn);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	515 graphics_handle newValue = checkedObj->properties ().get___myhandle__ ();
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	516
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	517 if (oldValue != newValue)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	518 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	519 octave_scalar_map eventData;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	520 eventData.setfield ("OldValue", oldValue.as_octave_value ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	521 eventData.setfield ("NewValue", newValue.as_octave_value ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	522 eventData.setfield ("Source", bp.get___myhandle__ ().as_octave_value ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	523 eventData.setfield ("EventName", "SelectionChanged");
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26816 diff changeset	524 octave_value selectionChangedEventObject (new octave_struct (eventData));
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	525 emit gh_callback_event (m_handle, "selectionchangedfcn",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27317 diff changeset	526 selectionChangedEventObject);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22188 diff changeset	527 }
21824 6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	528 }
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	529
6780a8657be3 Implement uibuttongroup (bug #47513) Andrew Thornton <art27@cantab.net> parents: diff changeset	530 };

Mercurial > octave

annotate libgui/graphics/ButtonGroup.cc @ 27919:1891570abac8