octave: libgui/graphics/Figure.cc annotate

annotate libgui/graphics/Figure.cc @ 27303:07b330708e3c

use Qt signals for interpreter callbacks in Qt graphics toolkit * Backend.h, Backend.cc (Backend::m_interpreter): New data member. (Backend::createObject): Pass pointer to invoking Backend object in signal argument list. (Backend::interpreter_event): New slots. Access interpreter event_manager to post interpreter callbacks events here. * ObjectFactory.h, ObjectFactory.cc (ObjectFactory::createObject): New arg, backend. Connect interpreter_event signal from newly created object to interpreter_event slot in backend object. * __init_qt__.cc (__init__): Pass interpreter to Backend constructor. * module.mk (OCTAVE_GUI_GRAPHICS_MOC): New files, moc-Canvas.cc and moc-Container.cc. * Object.h (Object::interpreter_event): New signals. * Canvas.h, Canvas.cc (Canvas::interprter_event): New signals. (Canvas::canvasMouseReleaseEvent): Emit interpreter_event signal instead of accessing interpreter event_manager object directly here. * GLCanvas.cc (GLCanvas::do_print): Emit interpreter_event signal instead of accessing interpreter event_manager object directly here. * Container.h, Container.cc (Container::interpreter_event): New signals. (Container::canvas): Forward Canvas interpreter_event signals to Container interpreter_event signals. * ButtonGroup.cc (ButtonGroup::ButtonGroup) Forward Container interpreter_event signals to the ButtonGroup interpreter_event signal. Since ButtonGroup is derived from Object, this connection and the one made by ObjectFactory::createObject has the effect of passing the interpreter_event signal up to the Backend interpreter_event slot. * Figure.cc (Figure::Figure): Likewise, for Figure. * Panel.cc (Panel::Panel): Likewise, for Panel.

author	John W. Eaton <jwe@octave.org>
date	Mon, 29 Jul 2019 10:43:20 -0400
parents	99aa1bcb8848
children	6b2d20317b26

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
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27224 diff changeset	59 #include "qt-interpreter-events.h"
19685 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
27107 6bc32e6a1b4f Restore hability to compile with Qt < 5.6 (bug #56376) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27099 diff changeset	101 retval.setPixel (jj, ii, tmp.rgba ());
27099 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
27303 07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	121 connect (m_container, SIGNAL (interpeter_event (const fcn_callback&)),
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	122 this, SIGNAL (interpeter_event (const fcn_callback&)));
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	123
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	124 connect (m_container, SIGNAL (interpeter_event (const meth_callback&)),
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	125 this, SIGNAL (interpeter_event (const meth_callback&)));
07b330708e3c use Qt signals for interpreter callbacks in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	126
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	127 figure::properties& fp = properties<figure> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	128
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	129 // Adjust figure position
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	130 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	131 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	132
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	133 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	134
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	135 // 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	136 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	137 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	138 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	139
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	140 // Status bar
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	141 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	142 m_statusBar->setVisible (false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	143
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	144 if (fp.toolbar_is ("figure")
26338 358bed84511b Display figure toolbar correctly (bug #55350). Rik <rik@octave.org> parents: 26130 diff changeset	145 \|\| (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	146 showFigureStatusBar (true);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	147
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	148 // Enable mouse tracking unconditionally
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	149 enableMouseTracking ();
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 // 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	152 // 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	153
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	154 // Figure title
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	155 update (figure::properties::ID_NUMBERTITLE);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	156
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	157 // Decide what keyboard events we listen to
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	158 m_container->canvas (m_handle)->setEventMask (0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	159 update (figure::properties::ID_KEYPRESSFCN);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	160 update (figure::properties::ID_KEYRELEASEFCN);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	161
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	162 // modal style
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	163 update (figure::properties::ID_WINDOWSTYLE);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	164
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	165 // Handle resizing constraints
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	166 update (figure::properties::ID_RESIZE);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	167
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	168 // 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	169 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	170
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	171 // Visibility
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	172 update (figure::properties::ID_VISIBLE);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	173
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	174 connect (this, SIGNAL (asyncUpdate (void)),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	175 this, SLOT (updateContainer (void)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	176
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	177 // 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	178 // 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	179 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	180 this, SLOT (figureWindowShown ()));
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	181
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	182 win->addReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	183 m_container->addReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	184 }
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 Figure::~Figure (void)
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22413 diff changeset	187 { }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	188
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	189 QString
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	190 Figure::fileName (void)
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 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	193
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	194 const figure::properties& fp = properties<figure> ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	195
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	196 std::string name = fp.get_filename ();
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 return QString::fromStdString (name);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	199 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	200
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	201 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	202 Figure::setFileName (const QString& name)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	203 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	204 gh_manager::auto_lock lock;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	205
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	206 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	207
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	208 fp.set_filename (name.toStdString ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	209 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	210
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	211 MouseMode
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	212 Figure::mouseMode (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	213 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	214 gh_manager::auto_lock lock;
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 const figure::properties& fp = properties<figure> ();
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 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	219
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	220 if (mode == "zoom")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	221 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	222 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	223
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	224 std::string direction = zm.getfield ("Direction").string_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	225
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23800 diff changeset	226 mode += ' ' + direction;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	227 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	228
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	229 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	230 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	231 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	232 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	233 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	234 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	235 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	236 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	237 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	238 return TextMode;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	239
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	240 return NoMode;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	241 }
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	242
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	243 void
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	244 Figure::set_geometry (QRect r)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	245 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	246 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	247
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	248 if (! m_resizable)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	249 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	250 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	251 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	252 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	253
26821 f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	254 // 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	255 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	256 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	257 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	258
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	259 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	260
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	261 if (! m_resizable)
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	262 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	263 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	264 win->setFixedSize(win->size ());
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	265 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 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 Container*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	269 Figure::innerContainer (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	270 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	271 return m_container;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	272 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	273
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	274 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	275 Figure::redraw (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	276 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	277 Canvas *canvas = m_container->canvas (m_handle);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	278
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	279 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	280 canvas->redraw ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	281
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	282 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	283 qWidget<QWidget> ()->findChildren<QObject*> ())
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	284 {
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	285 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	286 \|\| 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	287 \|\| 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	288 \|\| qobj->objectName () == "UITable")
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	289 {
26816 92ecc4a97b5c Properly redraw uixx objects after Qt figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26520 diff changeset	290 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	291
23223 4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	292 if (obj)
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	293 obj->slotRedraw ();
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	294 }
4b642b593ec2 maint: Indent foreach blocks in Qt GUI code for readability. Rik <rik@octave.org> parents: 23220 diff changeset	295 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	296 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	297
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	298 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	299 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	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 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	302
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	303 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	304 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	305 }
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	306
d04b74f5d02e make shg and figure (N) activate and raise figure windows (bug #45943) John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	307 void
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	308 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	309 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	310 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	311
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	312 if (canvas)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	313 canvas->print (file_cmd, term);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	314 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	315
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	316 uint8NDArray
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	317 Figure::slotGetPixels (void)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	318 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	319 uint8NDArray retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	320 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	321
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	322 if (canvas)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	323 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	324 gh_manager::process_events ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	325 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	326 retval = canvas->getPixels ();
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	327 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	328
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	329 return retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	330 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	331
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	332 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	333 Figure::beingDeleted (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	334 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	335 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	336
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	337 if (canvas)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	338 canvas->blockRedraw (true);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	339
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	340 m_container->removeReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	341 qWidget<FigureWindow> ()->removeReceiver (this);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	342 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	343
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	344 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	345 Figure::update (int pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	346 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	347 if (m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	348 return;
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	349
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	350 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	351
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	352 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	353 return;
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	354
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	355 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	356
25044 b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	357 // 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	358 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	359 return;
b6aea95a7bf9 store graphics object in Qt backend to avoid crash (bug #53487, #53500) John W. Eaton <jwe@octave.org> parents: 24691 diff changeset	360
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	361 m_blockUpdates = true;
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	362
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	363 switch (pId)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	364 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	365 case figure::properties::ID_POSITION:
19621 af0399a5aae0 untabify QtHandles source files John W. Eaton <jwe@octave.org> parents: 19616 diff changeset	366 {
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	367 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	368 int toffset = 0;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	369 int boffset = 0;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	370
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	371 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	372 if (! tb->isHidden ())
2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	373 toffset += tb->sizeHint ().height ();
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	374
19621 af0399a5aae0 untabify QtHandles source files John W. Eaton <jwe@octave.org> parents: 19616 diff changeset	375 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	376 toffset += m_menuBar->sizeHint ().height ();
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20524 diff changeset	377
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	378 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	379 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	380
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	381 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	382 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	383 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	384
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	385 case figure::properties::ID_NAME:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	386 case figure::properties::ID_NUMBERTITLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	387 win->setWindowTitle (Utils::fromStdString (fp.get_title ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	388 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	389
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	390 case figure::properties::ID_VISIBLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	391 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	392 {
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	393 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	394 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	395 {
8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	396 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	397 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	398 }
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	399 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	400 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	401 win->hide ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	402 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	403
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	404 case figure::properties::ID_RESIZE:
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	405 if (fp.is_resize ())
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::Preferred, QSizePolicy::Preferred);
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	408 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	409 m_resizable = true;
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 else
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	412 {
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	413 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	414 win->setFixedSize(win->size ());
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	415 m_resizable = false;
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	416 }
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	417 break;
ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	418
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	419 case figure::properties::ID_MENUBAR:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	420 case figure::properties::ID_TOOLBAR:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	421 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	422 showFigureStatusBar (false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	423 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	424 showFigureStatusBar (true);
26338 358bed84511b Display figure toolbar correctly (bug #55350). Rik <rik@octave.org> parents: 26130 diff changeset	425 else // "auto"
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	426 showFigureStatusBar (fp.menubar_is ("figure"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	427 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	428
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	429 case figure::properties::ID_KEYPRESSFCN:
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	430 if (fp.get_keypressfcn ().isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	431 m_container->canvas (m_handle)->clearEventMask (Canvas::KeyPress);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	432 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	433 m_container->canvas (m_handle)->addEventMask (Canvas::KeyPress);
27224 9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	434 // Signal the change to uipanels as well
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	435 foreach (QObject *qobj,
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	436 qWidget<QWidget> ()->findChildren<QObject*> ())
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	437 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	438 if (qobj->objectName () == "UIPanel")
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	439 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	440 Object *obj = Object::fromQObject (qobj);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	441
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	442 if (obj)
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	443 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	444 if (fp.get_keypressfcn ().isempty ())
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	445 obj->innerContainer ()->canvas (m_handle)->
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	446 clearEventMask (Canvas::KeyPress);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	447 else
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	448 obj->innerContainer ()->canvas (m_handle)->
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	449 addEventMask (Canvas::KeyPress);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	450 }
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	451 }
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	452 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	453 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	454
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	455 case figure::properties::ID_KEYRELEASEFCN:
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23535 diff changeset	456 if (fp.get_keyreleasefcn ().isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	457 m_container->canvas (m_handle)->clearEventMask (Canvas::KeyRelease);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	458 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	459 m_container->canvas (m_handle)->addEventMask (Canvas::KeyRelease);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	460 break;
27224 9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	461 // Signal the change to uipanels as well
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	462 foreach (QObject *qobj,
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	463 qWidget<QWidget> ()->findChildren<QObject*> ())
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	464 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	465 if (qobj->objectName () == "UIPanel")
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	466 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	467 Object *obj = Object::fromQObject (qobj);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	468
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	469 if (obj)
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	470 {
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	471 if (fp.get_keypressfcn ().isempty ())
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	472 obj->innerContainer ()->canvas (m_handle)->
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	473 clearEventMask (Canvas::KeyRelease);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	474 else
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	475 obj->innerContainer ()->canvas (m_handle)->
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	476 addEventMask (Canvas::KeyRelease);
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	477 }
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	478 }
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	479 }
9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	480 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	481
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	482 case figure::properties::ID_WINDOWSTYLE:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	483 if (fp.windowstyle_is ("modal"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	484 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	485 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	486
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	487 // 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	488 // make it use the modal settings
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	489 if (is_visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	490 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	491
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	492 win->setWindowModality (Qt::ApplicationModal);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	493 win->setVisible (is_visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	494 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	495 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	496 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	497
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	498 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	499
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	500 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	501 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	502 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	503 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	504 break;
27107 6bc32e6a1b4f Restore hability to compile with Qt < 5.6 (bug #56376) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27099 diff changeset	505 OCTAVE_FALLTHROUGH;
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	506
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	507 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	508 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	509 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	510 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	511 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	512 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	513 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	514 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	515 .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	516 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	517
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	518 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	519 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	520 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	521
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	522 m_blockUpdates = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	523 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	524
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	525 void
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	526 Figure::showFigureStatusBar (bool visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	527 {
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	528 if (m_statusBar
cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	529 && (! m_statusBar->isHidden ()) != visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	530 {
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	531 int dy = m_statusBar->sizeHint ().height ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	532 QRect r = qWidget<QWidget> ()->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	533
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	534 if (! visible)
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	535 r.adjust (0, 0, 0, -dy);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	536 else
26902 cb5c1ea2062c Fix regression with toolbar and status bar visibility (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26884 diff changeset	537 r.adjust (0, 0, 0, dy);
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 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	540 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	541 m_statusBar->setVisible (visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	542 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	543
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	544 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	545 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	546 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	547
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	548 void
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	549 Figure::updateFigureHeight (int dh)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	550 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	551 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	552 graphics_object go = object ();
20270 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20242 diff changeset	553
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	554 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	555 {
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	556 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	557
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	558 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	559
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	560 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	561 set_geometry (r);
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	562 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	563
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	564 updateBoundingBox (false);
6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	565 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	566 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	567
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	568 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	569 Figure::updateStatusBar (ColumnVector pt)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	570 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	571 if (! m_statusBar->isHidden ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	572 m_statusBar->showMessage (QString ("(%1, %2)")
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	573 .arg (pt(0), 0, 'g', 5)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	574 .arg (pt(1), 0, 'g', 5));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	575 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	576
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	577 QWidget*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	578 Figure::menu (void)
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 return qWidget<QMainWindow> ()->menuBar ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	581 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	582
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	583 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	584 Figure::updateBoundingBox (bool internal, int flags)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	585 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	586 QWidget *win = qWidget<QWidget> ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	587 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	588 std::string prop;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	589
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	590 if (internal)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	591 {
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	592 prop = "position";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	593 QRect r = m_innerRect;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	594
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	595 if (flags & UpdateBoundingBoxPosition)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	596 r.moveTopLeft (win->mapToGlobal (m_container->pos ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	597 if (flags & UpdateBoundingBoxSize)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	598 r.setSize (m_container->size ());
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 (r.isValid () && r != m_innerRect)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	601 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	602 m_innerRect = r;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	603
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	604 bb(0) = r.x ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	605 bb(1) = r.y ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	606 bb(2) = r.width ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	607 bb(3) = r.height ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	608 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	609 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	610 return;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	611 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	612 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	613 {
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	614 prop = "outerposition";
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	615 QRect r = m_outerRect;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	616
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	617 if (flags & UpdateBoundingBoxPosition)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	618 r.moveTopLeft (win->pos ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	619 if (flags & UpdateBoundingBoxSize)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	620 r.setSize (win->frameGeometry ().size ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	621
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	622 if (r.isValid () && r != m_outerRect)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	623 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	624 m_outerRect = r;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	625
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	626 bb(0) = r.x ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	627 bb(1) = r.y ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	628 bb(2) = r.width ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	629 bb(3) = r.height ();
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 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	632 return;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	633 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	634
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	635 figure::properties& fp = properties<figure> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	636
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	637 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	638 prop == "position");
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	639 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	640
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	641 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	642 Figure::eventNotifyBefore (QObject obj, QEvent xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	643 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	644 if (! m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	645 {
24465 1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	646 // 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	647 if (xevent->type () == QEvent::MouseButtonPress)
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	648 {
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	649 figure::properties& fp = properties<figure> ();
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	650 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	651 if (fp.get_handlevisibility () == "on")
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	652 root.set ("currentfigure",
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	653 fp.get___myhandle__ ().as_octave_value ());
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	654 }
1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	655
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	656 if (obj == m_container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	657 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	658 // Do nothing...
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	659 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	660 else if (obj == m_menuBar)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	661 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	662 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	663 {
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	664 case QEvent::ActionAdded:
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	665 case QEvent::ActionChanged:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	666 case QEvent::ActionRemoved:
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	667 m_previousHeight = m_menuBar->sizeHint ().height ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	668
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	669 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	670 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	671 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	672 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	673 else
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 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	676 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	677 case QEvent::Close:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	678 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	679 gh_manager::post_callback (m_handle, "closerequestfcn");
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	680 return true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	681
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	682 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	683 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	684 }
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 }
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	687
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	688 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	689 }
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	690
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	691 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	692 Figure::eventNotifyAfter (QObject watched, QEvent xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	693 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	694 if (! m_blockUpdates)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	695 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	696 if (watched == m_container)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	697 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	698 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	699 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	700 case QEvent::Resize:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	701 updateBoundingBox (true, UpdateBoundingBoxSize);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	702 break;
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	703
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	704 case QEvent::ChildAdded:
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23224 diff changeset	705 if (dynamic_cast<QChildEvent *> (xevent)->child
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	706 ()->isWidgetType())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	707 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	708 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	709 update (figure::properties::ID_TOOLBAR);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	710
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	711 enableMouseTracking ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	712 }
23800 2fdc65c031b5 Add break or continue statements to prevent implicit fall-through in case statements. Rik <rik@octave.org> parents: 23795 diff changeset	713 break;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	714
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	715 case QEvent::ChildRemoved:
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23224 diff changeset	716 if (dynamic_cast<QChildEvent *> (xevent)->child
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	717 ()->isWidgetType())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	718 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	719 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	720 update (figure::properties::ID_TOOLBAR);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	721 }
23800 2fdc65c031b5 Add break or continue statements to prevent implicit fall-through in case statements. Rik <rik@octave.org> parents: 23795 diff changeset	722 break;
21916 3a0c90b59584 Make qt figure window "Help" menu correspond to main window (bug #48223) Mike Miller <mtmiller@octave.org> parents: 21824 diff changeset	723
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	724 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	725 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	726 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	727 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	728 else if (watched == m_menuBar)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	729 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	730 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	731 {
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	732 case QEvent::ActionAdded:
22744 2df51376f587 Correctly handle visibility of custom menu items (bug #49529) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22721 diff changeset	733 case QEvent::ActionChanged:
25878 bb4af245dff7 Use uimenu objects for default menus in Qt toolkit Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25852 diff changeset	734 case QEvent::ActionRemoved:
23224 73f7ef7169ac Make uimenu "Position" property Matlab-compatible (bug #50369). Rik <rik@octave.org> parents: 23223 diff changeset	735 // 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	736 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	737 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	738 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	739 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	740 && ! a->isSeparator ())
25888 6109f302cf43 Fix regression with "menubar" figure property handling (bug #54678) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25886 diff changeset	741 updateFigureHeight (m_previousHeight - currentHeight);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	742 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	743 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	744
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	745 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	746 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	747 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	748 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	749 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	750 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	751 switch (xevent->type ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	752 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	753 case QEvent::Move:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	754 updateBoundingBox (false, UpdateBoundingBoxPosition);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	755 updateBoundingBox (true, UpdateBoundingBoxPosition);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	756 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19625 diff changeset	757
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	758 case QEvent::Resize:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	759 updateBoundingBox (false, UpdateBoundingBoxSize);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	760 break;
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	761
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	762 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	763 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	764 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	765 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	766 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	767 }
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	768
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	769 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	770 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	771 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	772 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	773
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	774 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	775 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	776
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	777 if (! visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	778 win->addToolBar (bar);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	779 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	780 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	781 QSize sz = bar->sizeHint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	782 QRect r = win->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	783
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	784 r.adjust (0, -sz.height (), 0, 0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	785
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	786 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	787 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	788 win->addToolBarBreak ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	789 win->addToolBar (bar);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	790 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	791
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	792 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	793 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	794 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	795
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	796 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	797 Figure::showCustomToolBar (QToolBar *bar, bool visible)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	798 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	799 QMainWindow *win = qWidget<QMainWindow> ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	800
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	801 if ((! bar->isHidden ()) != visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	802 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	803 QSize sz = bar->sizeHint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	804 QRect r = win->geometry ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	805
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	806 if (visible)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	807 r.adjust (0, -sz.height (), 0, 0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	808 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	809 r.adjust (0, sz.height (), 0, 0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	810
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	811 m_blockUpdates = true;
25929 ea5182364e5f Implement "resize" property for Qt figures (bug #54774) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	812 set_geometry (r);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	813 bar->setVisible (visible);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	814 m_blockUpdates = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	815
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	816 updateBoundingBox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	817 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	818 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	819
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	820 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	821 Figure::updateContainer (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	822 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	823 redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	824 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	825
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	826 void
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	827 Figure::figureWindowShown ()
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	828 {
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	829 #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	830 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	831 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	832
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	833 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	834
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	835 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	836 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	837
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	838 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	839 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	840 #endif
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	841 }
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	842
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	843 void
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	844 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	845 {
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	846 #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	847 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	848
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	849 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	850 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	851 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	852 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	853 {
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	854 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	855
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	856 // 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	857 // 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	858 redraw ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	859 }
26882 7a6366dbe77e avoid unused parameter warning John W. Eaton <jwe@octave.org> parents: 26520 diff changeset	860 #else
7a6366dbe77e avoid unused parameter warning John W. Eaton <jwe@octave.org> parents: 26520 diff changeset	861 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	862 #endif
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	863 }
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	864
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	865 void
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	866 Figure::enableMouseTracking (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	867 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	868 // Enable mouse tracking on every widgets
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	869 m_container->setMouseTracking (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	870 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	871 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	872 w->setMouseTracking (true);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	873 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	874
22413 8758addcf265 maint: Remove ';' at end of namespace declaration. Rik <rik@octave.org> parents: 22411 diff changeset	875 }

Mercurial > octave

annotate libgui/graphics/Figure.cc @ 27303:07b330708e3c