octave: libgui/graphics/Figure.cc annotate

annotate libgui/graphics/Figure.cc @ 27099:2cd31365c84a

Implement "pointer" and related figure properties for Qt toolkit (bug #56347) * genpropdoc.m: Document "pointer", "pointershapecdata" and "pointershapehotspot" properties. * libgui/src/icons, libgui/src/module.mk, libgui/src/resource.qrc: Add new cursor png images extracted from the standard DMZ theme. Also add circle.png/svg designed to look like DMZ icons. * Canvas.[h, cc] (Canvas::setCursor): Change signature to include, pointer name, cdata and hotspot location. Use Qt standard QCursors for "arrow", "ibeam", and "watch" cursors. Use DMZ theme cursors for others. Build QCursor from Qimage for "custom" pointers. * Figure.[h,cc](m_pointer_cdata): New QImage data member. (pointer_to_qimage): New static function to convert from Matrix to QImage. (Figure::update): Call Canvas::setCursor whenever "pointer" or "pointershapehotspot" is updated. Refresh m_pointer_cdata when updating "pointershapecdata" and eventually call Canvas::setCursor. * graphics.in.h(figure::properties::pointershapecdata): Use 1 as default value for all pixels.

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Sun, 19 May 2019 11:15:10 +0200
parents	cb5c1ea2062c
children	6bc32e6a1b4f

rev	line source
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26338 diff changeset	3 Copyright (C) 2011-2019 Michael Goffioul
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	4
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	5 This file is part of Octave.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24465 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24465 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	10 (at your option) any later version.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22744 diff changeset	15 GNU General Public License for more details.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	16
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24465 diff changeset	19 <https://www.gnu.org/licenses/>.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	20
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21662 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	24 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	26
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <QAction>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	28 #include <QActionEvent>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29 #include <QApplication>
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	30 #include <QClipboard>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <QEvent>
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	32 #include <QFileDialog>
7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	33 #include <QFileInfo>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QFrame>
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	35 #include <QImage>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include <QMainWindow>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include <QMenu>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include <QMenuBar>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include <QMessageBox>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include <QtDebug>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include <QTimer>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include <QToolBar>
25886 d3f5d021255d Allow building with Qt4 again (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	43 #if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
d3f5d021255d Allow building with Qt4 again (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	44 # include <QWindow>
d3f5d021255d Allow building with Qt4 again (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	45 # include <QScreen>
d3f5d021255d Allow building with Qt4 again (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	46 #endif
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	47
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "Canvas.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "Container.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "Figure.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "FigureWindow.h"
18505 fb96b7f55242 rename file to avoid clash on case-insenstive filesystems (bug #41658) John W. Eaton <jwe@octave.org> parents: 18501 diff changeset	52 #include "QtHandlesUtils.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	53
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	54 #include "file-ops.h"
27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	55 #include "unwind-prot.h"
20085 c58cf3a65519 improve copy to clipboard code for Qt plotting John W. Eaton <jwe@octave.org> parents: 20079 diff changeset	56 #include "utils.h"
21916 3a0c90b59584 Make qt figure window "Help" menu correspond to main window (bug #48223) Mike Miller <mtmiller@octave.org> parents: 21824 diff changeset	57 #include "version.h"
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	58
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	59 #include "octave-qt-link.h"
7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	60
7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	61 #include "builtin-defun-decls.h"
7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	62
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	63 namespace QtHandles
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	64 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	65
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	66 DECLARE_GENERICEVENTNOTIFY_SENDER(MenuBar, QMenuBar);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	67
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	68 static QRect
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	69 boundingBoxToRect (const Matrix& bb)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	70 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	71 QRect r;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	72
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	73 if (bb.numel () == 4)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	74 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	75 r = QRect (octave::math::round (bb(0)), octave::math::round (bb(1)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	76 octave::math::round (bb(2)), octave::math::round (bb(3)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	77 if (! r.isValid ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	78 r = QRect ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	79 }
19954 b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	80
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	81 return r;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	82 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	83
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	84 static QImage
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	85 pointer_to_qimage (const Matrix& cdata)
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	86 {
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	87 QImage retval (cdata.rows (), cdata.columns (), QImage::Format_ARGB32);
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	88 QColor tmp ("White");
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	89 QColor black ("Black");
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	90 QColor white ("White");
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	91 for (octave_idx_type ii = 0; ii < cdata.rows (); ii++)
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	92 for (octave_idx_type jj = 0; jj < cdata.columns (); jj++)
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	93 {
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	94 if (cdata(ii,jj) == 1.0)
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	95 tmp = black;
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	96 else if (cdata(ii,jj) == 2.0)
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	97 tmp = white;
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	98 else
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	99 tmp.setAlpha (0);
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	100
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	101 retval.setPixelColor(jj, ii, tmp);
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	102 }
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	103
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	104 return retval;
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	105 }
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	106
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	107 Figure*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	108 Figure::create (const graphics_object& go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	109 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	110 return new Figure (go, new FigureWindow ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	111 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	112
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	113 Figure::Figure (const graphics_object& go, FigureWindow *win)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23793 diff changeset	114 : Object (go, win), m_blockUpdates (false), m_figureToolBar (nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23793 diff changeset	115 m_menuBar (nullptr), m_innerRect (), m_outerRect (),
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	116 m_previousHeight (0), m_resizable (true)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	117 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	118 m_container = new Container (win);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	119 win->setCentralWidget (m_container);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	120
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	121 figure::properties& fp = properties<figure> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	122
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	123 // Adjust figure position
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	124 m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	125 m_outerRect = boundingBoxToRect (fp.get_boundingbox (false));
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	126
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	127 set_geometry (m_innerRect);
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	128
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	129 // Menubar
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	130 m_menuBar = new MenuBar (win);
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	131 win->setMenuBar (m_menuBar);
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	132 m_menuBar->addReceiver (this);
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	133
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	134 // Status bar
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	135 m_statusBar = win->statusBar ();
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	136 m_statusBar->setVisible (false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	137
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	138 if (fp.toolbar_is ("figure")
26338 358bed84511b Display figure toolbar correctly (bug #55350). Rik <rik@octave.org> parents: 26130 diff changeset	139 \|\| (fp.toolbar_is ("auto") && fp.menubar_is ("figure")))
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	140 showFigureStatusBar (true);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	141
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	142 // Enable mouse tracking unconditionally
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	143 enableMouseTracking ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	144
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	145 // When this constructor gets called all properties are already
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	146 // set, even non default. We force "update" here to get things right.
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: 22370 diff changeset	148 // Figure title
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	149 update (figure::properties::ID_NUMBERTITLE);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	150
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	151 // Decide what keyboard events we listen to
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	152 m_container->canvas (m_handle)->setEventMask (0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	153 update (figure::properties::ID_KEYPRESSFCN);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	154 update (figure::properties::ID_KEYRELEASEFCN);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	155
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	156 // modal style
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	157 update (figure::properties::ID_WINDOWSTYLE);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	158
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	159 // Handle resizing constraints
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	160 update (figure::properties::ID_RESIZE);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	161
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	162 // Custom pointer data
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	163 update (figure::properties::ID_POINTERSHAPECDATA);
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	164
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	165 // Visibility
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	166 update (figure::properties::ID_VISIBLE);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	167
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	168 connect (this, SIGNAL (asyncUpdate (void)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	169 this, SLOT (updateContainer (void)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	170
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	171 // Register for the signal that indicates when a window has moved
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	172 // to a different screen
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	173 connect (win, SIGNAL (figureWindowShown ()),
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	174 this, SLOT (figureWindowShown ()));
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	175
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	176 win->addReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	177 m_container->addReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	178 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	179
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	180 Figure::~Figure (void)
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22413 diff changeset	181 { }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	182
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	183 QString
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	184 Figure::fileName (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	185 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	186 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	187
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	188 const figure::properties& fp = properties<figure> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	189
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	190 std::string name = fp.get_filename ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	191
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	192 return QString::fromStdString (name);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	193 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	194
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	195 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	196 Figure::setFileName (const QString& name)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	197 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	198 gh_manager::auto_lock lock;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	199
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	200 figure::properties& fp = properties<figure> ();
20537 d0f886a030b7 Use "update" method to initialize Qt Figures (cleanup + bug #46086) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20531 diff changeset	201
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	202 fp.set_filename (name.toStdString ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	203 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	204
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	205 MouseMode
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	206 Figure::mouseMode (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	207 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	208 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	209
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	210 const figure::properties& fp = properties<figure> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	211
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	212 std::string mode = fp.get___mouse_mode__ ();
20537 d0f886a030b7 Use "update" method to initialize Qt Figures (cleanup + bug #46086) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20531 diff changeset	213
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	214 if (mode == "zoom")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	215 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	216 octave_scalar_map zm = fp.get___zoom_mode__ ().scalar_map_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	217
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	218 std::string direction = zm.getfield ("Direction").string_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	219
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23800 diff changeset	220 mode += ' ' + direction;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	221 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	222
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	223 if (mode == "rotate")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	224 return RotateMode;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	225 else if (mode == "zoom in")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	226 return ZoomInMode;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	227 else if (mode == "zoom out")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	228 return ZoomOutMode;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	229 else if (mode == "pan")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	230 return PanMode;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	231 else if (mode == "text")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	232 return TextMode;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	233
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	234 return NoMode;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	235 }
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	236
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	237 void
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	238 Figure::set_geometry (QRect r)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	239 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	240 QMainWindow *win = qWidget<QMainWindow> ();
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	241
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	242 if (! m_resizable)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	243 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	244 win->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	245 win->setFixedSize (QSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	246 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	247
26821 f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	248 // Unlock window if it is maximized or full-screen
f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	249 int state = win->windowState ();
f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	250 if (state == Qt::WindowFullScreen \|\| state == Qt::WindowMaximized)
f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	251 win->setWindowState (Qt::WindowNoState);
f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	252
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	253 win->setGeometry (r);
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	254
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	255 if (! m_resizable)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	256 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	257 win->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	258 win->setFixedSize(win->size ());
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	259 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	260 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	261
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	262 Container*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	263 Figure::innerContainer (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	264 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	265 return m_container;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	266 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	267
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	268 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	269 Figure::redraw (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	270 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	271 Canvas *canvas = m_container->canvas (m_handle);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	272
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	273 if (canvas)
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	274 canvas->redraw ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	275
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	276 foreach (QObject *qobj,
92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	277 qWidget<QWidget> ()->findChildren<QObject*> ())
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	278 {
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	279 if (qobj->objectName () == "UIPanel"
92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	280 \|\| qobj->objectName () == "UIButtonGroup"
26820 0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26816 diff changeset	281 \|\| qobj->objectName () == "UIControl"
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26816 diff changeset	282 \|\| qobj->objectName () == "UITable")
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	283 {
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	284 Object *obj = Object::fromQObject (qobj);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	285
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	286 if (obj)
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	287 obj->slotRedraw ();
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	288 }
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	289 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	290 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	291
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	292 void
25799 d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	293 Figure::show (void)
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	294 {
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	295 QWidget *win = qWidget<QWidget> ();
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	296
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	297 win->activateWindow ();
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	298 win->raise ();
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	299 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	300
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	301 void
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	302 Figure::print (const QString& file_cmd, const QString& term)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	303 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	304 Canvas *canvas = m_container->canvas (m_handle);
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	305
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	306 if (canvas)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	307 canvas->print (file_cmd, term);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	308 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	309
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	310 uint8NDArray
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	311 Figure::slotGetPixels (void)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	312 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	313 uint8NDArray retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	314 Canvas *canvas = m_container->canvas (m_handle);
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	315
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	316 if (canvas)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	317 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	318 gh_manager::process_events ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	319 gh_manager::auto_lock lock;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	320 retval = canvas->getPixels ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	321 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	322
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	323 return retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	324 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	325
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	326 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	327 Figure::beingDeleted (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	328 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	329 Canvas *canvas = m_container->canvas (m_handle.value (), false);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	330
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	331 if (canvas)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	332 canvas->blockRedraw (true);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	333
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	334 m_container->removeReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	335 qWidget<FigureWindow> ()->removeReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	336 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	337
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	338 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	339 Figure::update (int pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	340 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	341 if (m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	342 return;
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	343
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	344 figure::properties& fp = properties<figure> ();
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	345
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	346 if (fp.is___printing__ ())
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	347 return;
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	348
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	349 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	350
25044 b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	351 // If the window doesn't exist, there's nothing we can do.
b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	352 if (! win)
b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	353 return;
b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	354
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	355 m_blockUpdates = true;
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	356
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	357 switch (pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	358 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	359 case figure::properties::ID_POSITION:
19621 af0399a5aae0 untabify QtHandles source files John W. Eaton <jwe@octave.org> parents: 19616 diff changeset	360 {
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	361 m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	362 int toffset = 0;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	363 int boffset = 0;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	364
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	365 foreach (QToolBar tb, win->findChildren<QToolBar> ())
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	366 if (! tb->isHidden ())
2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	367 toffset += tb->sizeHint ().height ();
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	368
19621 af0399a5aae0 untabify QtHandles source files John W. Eaton <jwe@octave.org> parents: 19616 diff changeset	369 if (! m_menuBar->isHidden ())
22370 0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	370 toffset += m_menuBar->sizeHint ().height ();
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20524 diff changeset	371
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	372 if (! m_statusBar->isHidden ())
22370 0a2961d5893c Fix calculation of window height in Qt, FLTK (bug #48833, bug #48522). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22323 diff changeset	373 boffset += m_statusBar->sizeHint ().height ();
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	374
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	375 set_geometry (m_innerRect.adjusted (0, -toffset, 0, boffset));
19621 af0399a5aae0 untabify QtHandles source files John W. Eaton <jwe@octave.org> parents: 19616 diff changeset	376 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	377 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	378
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	379 case figure::properties::ID_NAME:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	380 case figure::properties::ID_NUMBERTITLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	381 win->setWindowTitle (Utils::fromStdString (fp.get_title ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	382 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	383
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	384 case figure::properties::ID_VISIBLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	385 if (fp.is_visible ())
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	386 {
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	387 QTimer::singleShot (0, win, SLOT (show ()));
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	388 if (! fp.is___gl_window__ ())
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	389 {
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	390 gh_manager::auto_lock lock;
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	391 fp.set ("__gl_window__", "on");
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	392 }
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	393 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	394 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	395 win->hide ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	396 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	397
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	398 case figure::properties::ID_RESIZE:
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	399 if (fp.is_resize ())
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	400 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	401 win->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	402 win->setFixedSize (QSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	403 m_resizable = true;
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	404 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	405 else
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	406 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	407 win->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	408 win->setFixedSize(win->size ());
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	409 m_resizable = false;
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	410 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	411 break;
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	412
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	413 case figure::properties::ID_MENUBAR:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	414 case figure::properties::ID_TOOLBAR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	415 if (fp.toolbar_is ("none"))
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	416 showFigureStatusBar (false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	417 else if (fp.toolbar_is ("figure"))
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	418 showFigureStatusBar (true);
26338 358bed84511b Display figure toolbar correctly (bug #55350). Rik <rik@octave.org> parents: 26130 diff changeset	419 else // "auto"
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	420 showFigureStatusBar (fp.menubar_is ("figure"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	421 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	422
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	423 case figure::properties::ID_KEYPRESSFCN:
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	424 if (fp.get_keypressfcn ().isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	425 m_container->canvas (m_handle)->clearEventMask (Canvas::KeyPress);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	426 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	427 m_container->canvas (m_handle)->addEventMask (Canvas::KeyPress);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	428 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	429
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	430 case figure::properties::ID_KEYRELEASEFCN:
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	431 if (fp.get_keyreleasefcn ().isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	432 m_container->canvas (m_handle)->clearEventMask (Canvas::KeyRelease);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	433 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	434 m_container->canvas (m_handle)->addEventMask (Canvas::KeyRelease);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	435 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	436
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	437 case figure::properties::ID_WINDOWSTYLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	438 if (fp.windowstyle_is ("modal"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	439 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	440 bool is_visible = win->isVisible ();
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	441
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	442 // if window is already visible, need to hide and reshow it in order to
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	443 // make it use the modal settings
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	444 if (is_visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	445 win->setVisible (false);
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	446
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	447 win->setWindowModality (Qt::ApplicationModal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	448 win->setVisible (is_visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	449 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	450 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	451 win->setWindowModality (Qt::NonModal);
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	452
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	453 break;
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	454
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	455 case figure::properties::ID_POINTERSHAPECDATA:
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	456 m_pointer_cdata =
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	457 pointer_to_qimage (fp.get_pointershapecdata ().matrix_value ());
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	458 if (fp.get_pointer () != "custom")
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	459 break;
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	460 // Avoid warning about potential fallthrough
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	461 [[fallthrough]];
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	462
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	463 case figure::properties::ID_POINTER:
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	464 case figure::properties::ID_POINTERSHAPEHOTSPOT:
25852 f6537847b043 ginput.m: temporarily disable mouse tools in Qt toolkit (bug #51452) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25799 diff changeset	465 case figure::properties::ID___MOUSE_MODE__:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	466 case figure::properties::ID___ZOOM_MODE__:
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	467 m_container->canvas (m_handle)->setCursor (mouseMode (),
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	468 fp.get_pointer (),
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	469 m_pointer_cdata,
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	470 fp.get_pointershapehotspot ()
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	471 .matrix_value());
25852 f6537847b043 ginput.m: temporarily disable mouse tools in Qt toolkit (bug #51452) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25799 diff changeset	472 break;
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	473
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	474 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	475 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	476 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	477
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	478 m_blockUpdates = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	479 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	480
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	481 void
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	482 Figure::showFigureStatusBar (bool visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	483 {
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	484 if (m_statusBar
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	485 && (! m_statusBar->isHidden ()) != visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	486 {
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	487 int dy = m_statusBar->sizeHint ().height ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	488 QRect r = qWidget<QWidget> ()->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	489
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	490 if (! visible)
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	491 r.adjust (0, 0, 0, -dy);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	492 else
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	493 r.adjust (0, 0, 0, dy);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	494
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	495 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	496 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	497 m_statusBar->setVisible (visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	498 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	499
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	500 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	501 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	502 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	503
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	504 void
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	505 Figure::updateFigureHeight (int dh)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	506 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	507 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	508 graphics_object go = object ();
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	509
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	510 if (go.valid_object () && dh != 0)
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	511 {
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	512 QRect r = qWidget<QWidget> ()->geometry ();
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	513
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	514 r.adjust (0, dh, 0, 0);
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	515
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	516 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	517 set_geometry (r);
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	518 m_blockUpdates = false;
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	519
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	520 updateBoundingBox (false);
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	521 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	522 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	523
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	524 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	525 Figure::updateStatusBar (ColumnVector pt)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	526 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	527 if (! m_statusBar->isHidden ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	528 m_statusBar->showMessage (QString ("(%1, %2)")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	529 .arg (pt(0), 0, 'g', 5)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	530 .arg (pt(1), 0, 'g', 5));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	531 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	532
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	533 QWidget*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	534 Figure::menu (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	535 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	536 return qWidget<QMainWindow> ()->menuBar ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	537 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	538
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	539 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	540 Figure::updateBoundingBox (bool internal, int flags)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	541 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	542 QWidget *win = qWidget<QWidget> ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	543 Matrix bb (1, 4);
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	544 std::string prop;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	545
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	546 if (internal)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	547 {
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	548 prop = "position";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	549 QRect r = m_innerRect;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	550
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	551 if (flags & UpdateBoundingBoxPosition)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	552 r.moveTopLeft (win->mapToGlobal (m_container->pos ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	553 if (flags & UpdateBoundingBoxSize)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	554 r.setSize (m_container->size ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	555
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	556 if (r.isValid () && r != m_innerRect)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	557 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	558 m_innerRect = r;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	559
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	560 bb(0) = r.x ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	561 bb(1) = r.y ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	562 bb(2) = r.width ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	563 bb(3) = r.height ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	564 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	565 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	566 return;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	567 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	568 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	569 {
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	570 prop = "outerposition";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	571 QRect r = m_outerRect;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	572
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	573 if (flags & UpdateBoundingBoxPosition)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	574 r.moveTopLeft (win->pos ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	575 if (flags & UpdateBoundingBoxSize)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	576 r.setSize (win->frameGeometry ().size ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	577
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	578 if (r.isValid () && r != m_outerRect)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	579 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	580 m_outerRect = r;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	581
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	582 bb(0) = r.x ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	583 bb(1) = r.y ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	584 bb(2) = r.width ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	585 bb(3) = r.height ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	586 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	587 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	588 return;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	589 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	590
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	591 figure::properties& fp = properties<figure> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	592
26469 bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	593 gh_manager::post_set (m_handle, prop, fp.bbox2position (bb), false,
bf835b1d04b1 Don't use C++ callbacks to notify position changes from Qt figures (bug #48519) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	594 prop == "position");
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	595 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	596
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	597 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	598 Figure::eventNotifyBefore (QObject obj, QEvent xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	599 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	600 if (! m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	601 {
24465 1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	602 // Clicking the toolbar or the menubar makes this figure current
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	603 if (xevent->type () == QEvent::MouseButtonPress)
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	604 {
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	605 figure::properties& fp = properties<figure> ();
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	606 graphics_object root = gh_manager::get_object (0);
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	607 if (fp.get_handlevisibility () == "on")
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	608 root.set ("currentfigure",
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	609 fp.get___myhandle__ ().as_octave_value ());
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	610 }
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	611
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	612 if (obj == m_container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	613 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	614 // Do nothing...
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	615 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	616 else if (obj == m_menuBar)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	617 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	618 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	619 {
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	620 case QEvent::ActionAdded:
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	621 case QEvent::ActionChanged:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	622 case QEvent::ActionRemoved:
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	623 m_previousHeight = m_menuBar->sizeHint ().height ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	624
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	625 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	626 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	627 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	628 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	629 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	630 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	631 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	632 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	633 case QEvent::Close:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	634 xevent->ignore ();
26520 278ae90567a7 Don't use C++ callback to notify close request from Qt Figures (bug #54187) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26469 diff changeset	635 gh_manager::post_callback (m_handle, "closerequestfcn");
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	636 return true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	637
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	638 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	639 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	640 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	641 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	642 }
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	643
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	644 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	645 }
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	646
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	647 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	648 Figure::eventNotifyAfter (QObject watched, QEvent xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	649 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	650 if (! m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	651 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	652 if (watched == m_container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	653 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	654 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	655 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	656 case QEvent::Resize:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	657 updateBoundingBox (true, UpdateBoundingBoxSize);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	658 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	659
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	660 case QEvent::ChildAdded:
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23224 diff changeset	661 if (dynamic_cast<QChildEvent *> (xevent)->child
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	662 ()->isWidgetType())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	663 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	664 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	665 update (figure::properties::ID_TOOLBAR);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	666
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	667 enableMouseTracking ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	668 }
23800 2fdc65c031b5 Add break or continue statements to prevent implicit fall-through in case statements. Rik <rik@octave.org> parents: 23795 diff changeset	669 break;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	670
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	671 case QEvent::ChildRemoved:
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23224 diff changeset	672 if (dynamic_cast<QChildEvent *> (xevent)->child
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	673 ()->isWidgetType())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	674 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	675 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	676 update (figure::properties::ID_TOOLBAR);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	677 }
23800 2fdc65c031b5 Add break or continue statements to prevent implicit fall-through in case statements. Rik <rik@octave.org> parents: 23795 diff changeset	678 break;
21916 3a0c90b59584 Make qt figure window "Help" menu correspond to main window (bug #48223) Mike Miller <mtmiller@octave.org> parents: 21824 diff changeset	679
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	680 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	681 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	682 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	683 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	684 else if (watched == m_menuBar)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	685 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	686 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	687 {
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	688 case QEvent::ActionAdded:
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	689 case QEvent::ActionChanged:
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	690 case QEvent::ActionRemoved:
23224 73f7ef7169ac Make uimenu "Position" property Matlab-compatible (bug #50369). Rik <rik@octave.org> parents: 23223 diff changeset	691 // The menubar may have been resized if no action is visible
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	692 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	693 QAction a = dynamic_cast<QActionEvent > (xevent)->action ();
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	694 int currentHeight = m_menuBar->sizeHint ().height ();
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	695 if (currentHeight != m_previousHeight
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	696 && ! a->isSeparator ())
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	697 updateFigureHeight (m_previousHeight - currentHeight);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	698 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	699 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	700
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	701 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	702 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	703 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	704 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	705 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	706 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	707 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	708 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	709 case QEvent::Move:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	710 updateBoundingBox (false, UpdateBoundingBoxPosition);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	711 updateBoundingBox (true, UpdateBoundingBoxPosition);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	712 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	713
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	714 case QEvent::Resize:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	715 updateBoundingBox (false, UpdateBoundingBoxSize);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	716 break;
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	717
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	718 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	719 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	720 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	721 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	722 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	723 }
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	724
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	725 void
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	726 Figure::addCustomToolBar (QToolBar *bar, bool visible, bool isdefault)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	727 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	728 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	729
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	730 if (isdefault)
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	731 m_figureToolBar = bar;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	732
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	733 if (! visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	734 win->addToolBar (bar);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	735 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	736 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	737 QSize sz = bar->sizeHint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	738 QRect r = win->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	739
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	740 r.adjust (0, -sz.height (), 0, 0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	741
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	742 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	743 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	744 win->addToolBarBreak ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	745 win->addToolBar (bar);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	746 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	747
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	748 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	749 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	750 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	751
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	752 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	753 Figure::showCustomToolBar (QToolBar *bar, bool visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	754 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	755 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	756
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	757 if ((! bar->isHidden ()) != visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	758 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	759 QSize sz = bar->sizeHint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	760 QRect r = win->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	761
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	762 if (visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	763 r.adjust (0, -sz.height (), 0, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	764 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	765 r.adjust (0, sz.height (), 0, 0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	766
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	767 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	768 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	769 bar->setVisible (visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	770 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	771
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	772 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	773 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	774 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	775
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	776 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	777 Figure::updateContainer (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	778 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	779 redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	780 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	781
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	782 void
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	783 Figure::figureWindowShown ()
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	784 {
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	785 #if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	786 QWindow* window = qWidget<QMainWindow> ()->windowHandle ();
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	787 QScreen* screen = window->screen ();
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	788
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	789 gh_manager::auto_lock lock;
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	790
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	791 figure::properties& fp = properties<figure> ();
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	792 fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	793
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	794 connect (window, SIGNAL (screenChanged (QScreen*)),
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	795 this, SLOT (screenChanged (QScreen*)));
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	796 #endif
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	797 }
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	798
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	799 void
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	800 Figure::screenChanged (QScreen* screen)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	801 {
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	802 #if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	803 gh_manager::auto_lock lock;
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	804
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	805 figure::properties& fp = properties<figure> ();
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	806 double old_dpr = fp.get___device_pixel_ratio__ ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	807 double new_dpr = screen->devicePixelRatio ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	808 if (old_dpr != new_dpr)
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	809 {
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	810 fp.set___device_pixel_ratio__ (new_dpr);
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	811
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	812 // For some obscure reason, changing the __device_pixel_ratio__ property
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	813 // from the GUI thread does not necessarily trigger a redraw. Force it.
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	814 redraw ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	815 }
26882 7a6366dbe77e avoid unused parameter warning John W. Eaton <jwe@octave.org> parents: 26520 diff changeset	816 #else
7a6366dbe77e avoid unused parameter warning John W. Eaton <jwe@octave.org> parents: 26520 diff changeset	817 octave_unused_parameter (screen);
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	818 #endif
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	819 }
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	820
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	821 void
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	822 Figure::enableMouseTracking (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	823 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	824 // Enable mouse tracking on every widgets
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	825 m_container->setMouseTracking (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	826 m_container->canvas (m_handle)->qWidget ()->setMouseTracking (true);
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	827 foreach (QWidget w, m_container->findChildren<QWidget> ())
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	828 w->setMouseTracking (true);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	829 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	830
22413 8758addcf265 maint: Remove ';' at end of namespace declaration. Rik <rik@octave.org> parents: 22411 diff changeset	831 }

Mercurial > octave

annotate libgui/graphics/Figure.cc @ 27099:2cd31365c84a