octave: libgui/graphics/Canvas.cc annotate

annotate libgui/graphics/Canvas.cc @ 27020:30e9204de313

move feval functions to interpreter class * interpreter.h, interpreter.cc (interpreter::feval): New functions created from global feval functions in oct-parse.yy. Change all uses. * oct-parse.yy (feval): Forward to interpreter::feval functions.

author	John W. Eaton <jwe@octave.org>
date	Mon, 01 Apr 2019 13:57:10 +0000
parents	ab5bfee22d18
children	2cd31365c84a

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: 26112 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: 24523 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: 22413 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: 24523 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: 22413 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: 22413 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: 22413 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22413 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22413 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: 24523 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: 21723 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 <QApplication>
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	28 #include <QBitmap>
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	29 #include <QCursor>
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	30 #include <QInputDialog>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <QList>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <QMouseEvent>
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	33 #include <QWheelEvent>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QRectF>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	35
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "Backend.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "Canvas.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "ContextMenu.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "GLCanvas.h"
18505 fb96b7f55242 rename file to avoid clash on case-insenstive filesystems (bug #41658) John W. Eaton <jwe@octave.org> parents: 18501 diff changeset	40 #include "QtHandlesUtils.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20090 diff changeset	42 #include "annotation-dialog.h"
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20090 diff changeset	43
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	44 #include "interpreter-private.h"
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	45 #include "interpreter.h"
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 20596 diff changeset	46 #include "oct-opengl.h"
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	47 #include "octave-qt-link.h"
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	48 #include "resource-manager.h"
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	49
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	50 #include "builtin-defun-decls.h"
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	51
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	52 namespace QtHandles
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	53 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	54
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	55 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	56 Canvas::redraw (bool sync)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	57 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	58 QWidget *w = qWidget ();
19953 ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19896 diff changeset	59
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	60 if (w)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	61 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	62 if (sync)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	63 w->repaint ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	64 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	65 w->update ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	66 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	67 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	68
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	69 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	70 Canvas::blockRedraw (bool block)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	71 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	72 m_redrawBlocked = block;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	73 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	74
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	75 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	76 Canvas::setCursor (MouseMode mode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	77 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	78 QWidget *w = qWidget ();
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	79 QCursor cursor = Qt::ArrowCursor;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	80 if (w)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	81 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	82 switch (mode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	83 {
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	84 case NoMode:
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	85 case SelectMode:
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	86 cursor = Qt::ArrowCursor;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	87 break;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	88
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	89 case PanMode:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	90 cursor = QCursor (octave::resource_manager::icon ("figure-pan")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	91 .pixmap (22, 22));
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	92 break;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	93
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	94 case RotateMode:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	95 cursor = QCursor (octave::resource_manager::icon ("figure-rotate")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	96 .pixmap (22, 22));
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	97 break;
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	98
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	99 case TextMode:
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	100 cursor = Qt::IBeamCursor;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	101 break;
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	102
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	103 case ZoomInMode:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	104 cursor = QCursor (octave::resource_manager::icon ("figure-zoom-in")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	105 .pixmap (22, 22), 9, 9);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	106 break;
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	107
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	108 case ZoomOutMode:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	109 cursor = QCursor (octave::resource_manager::icon ("figure-zoom-out")
992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	110 .pixmap (22, 22), 9, 9);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	111 break;
19954 b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19953 diff changeset	112
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	113 default:
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	114 cursor = Qt::ArrowCursor;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	115 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	116 }
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26861 diff changeset	117 w->setCursor (cursor);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	118 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	119 }
18612 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	120
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	121 /*
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	122 Two updateCurrentPoint() routines are required:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	123 1) Used for QMouseEvents where cursor position data is in callback from Qt.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	124 2) Used for QKeyEvents where cursor position must be determined.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	125 */
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	126 void
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	127 Canvas::updateCurrentPoint (const graphics_object& fig,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	128 const graphics_object& obj, QMouseEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	129 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	130 gh_manager::auto_lock lock;
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	131
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	132 gh_manager::post_set (fig.get_handle (), "currentpoint",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	133 Utils::figureCurrentPoint (fig, event), false);
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	134
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	135 Matrix children = obj.get_properties ().get_children ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	136 octave_idx_type num_children = children.numel ();
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	137
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	138 for (int i = 0; i < num_children; i++)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	139 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	140 graphics_object childObj (gh_manager::get_object (children(i)));
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	141
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	142 if (childObj.isa ("axes"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	143 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	144 axes::properties& ap = Utils::properties<axes> (childObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	145 Matrix x_zlim = ap.get_transform_zlim ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	146 graphics_xform x_form = ap.get_transform ();
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	147
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	148 ColumnVector p1 = x_form.untransform (event->x (), event->y (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	149 x_zlim(0));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	150 ColumnVector p2 = x_form.untransform (event->x (), event->y (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	151 x_zlim(1));
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20110 diff changeset	152
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	153 Matrix cp (2, 3, 0.0);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	154
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	155 cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	156 cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	157
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	158 gh_manager::post_set (childObj.get_handle (), "currentpoint", cp,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	159 false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	160 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	161 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	162 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	163
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	164 void
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	165 Canvas::updateCurrentPoint (const graphics_object& fig,
bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	166 const graphics_object& obj)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	167 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	168 gh_manager::auto_lock lock;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	169
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	170 gh_manager::post_set (fig.get_handle (), "currentpoint",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	171 Utils::figureCurrentPoint (fig), false);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	172
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	173 Matrix children = obj.get_properties ().get_children ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	174 octave_idx_type num_children = children.numel ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	175
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	176 for (int i = 0; i < num_children; i++)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	177 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	178 graphics_object childObj (gh_manager::get_object (children(i)));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	179
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	180 if (childObj.isa ("axes"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	181 {
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	182 // FIXME: QCursor::pos() may give inaccurate results with
bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	183 // asynchronous window systems like X11 over ssh.
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	184 QWidget *w = qWidget ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	185 QPoint p = w->mapFromGlobal (QCursor::pos ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	186 axes::properties& ap = Utils::properties<axes> (childObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	187 Matrix x_zlim = ap.get_transform_zlim ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	188 graphics_xform x_form = ap.get_transform ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	189
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	190 ColumnVector p1 = x_form.untransform (p.x (), p.y (), x_zlim(0));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	191 ColumnVector p2 = x_form.untransform (p.x (), p.y (), x_zlim(1));
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	192
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	193 Matrix cp (2, 3, 0.0);
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	194
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	195 cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	196 cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	197
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	198 gh_manager::post_set (childObj.get_handle (), "currentpoint", cp,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	199 false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	200 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	201 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	202 }
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	203
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	204 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	205 Canvas::annotation_callback (const octave_value_list& args)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	206 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	207 octave::interpreter& interp
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	208 = octave::__get_interpreter__ ("Canvas::annotation_callback");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	209
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	210 interp.feval ("annotation", args);
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	211
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	212 redraw ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	213 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	214
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	215 static void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	216 autoscale_axes (axes::properties& ap)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	217 {
26511 7bf8036ad3f6 Fix error when performing autoscale from Qt figures (bug #54920) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	218 gh_manager::auto_lock lock;
7bf8036ad3f6 Fix error when performing autoscale from Qt figures (bug #54920) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	219
7bf8036ad3f6 Fix error when performing autoscale from Qt figures (bug #54920) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	220 // Reset zoom stack
7bf8036ad3f6 Fix error when performing autoscale from Qt figures (bug #54920) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	221 ap.clear_zoom_stack (false);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	222
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	223 ap.set_xlimmode ("auto");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	224 ap.set_ylimmode ("auto");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	225 ap.set_zlimmode ("auto");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	226 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	227
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	228 void
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	229 Canvas::canvasPaintEvent (void)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	230 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	231 if (! m_redrawBlocked)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	232 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	233 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	234
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	235 draw (m_handle);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	236
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	237 if ((m_mouseMode == ZoomInMode && m_mouseAxes.ok ()) \|\| m_rectMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	238 drawZoomBox (m_mouseAnchor, m_mouseCurrent);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	239 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	240 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	241
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	242 static bool
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	243 pan_enabled (const graphics_object figObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	244 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	245 // Getting pan mode property:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	246 octave_value ov_pm
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	247 = Utils::properties<figure> (figObj).get___pan_mode__ ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	248
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	249 octave_scalar_map pm = ov_pm.scalar_map_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	250
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	251 return pm.contents ("Enable").string_value () == "on";
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	252 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	253
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	254 static std::string
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	255 pan_mode (const graphics_object figObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	256 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	257 // Getting pan mode property:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	258 octave_value ov_pm
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	259 = Utils::properties<figure> (figObj).get___pan_mode__ ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	260
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	261 octave_scalar_map pm = ov_pm.scalar_map_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	262
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	263 return pm.contents ("Motion").string_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	264 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	265
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	266 static bool
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	267 zoom_enabled (const graphics_object figObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	268 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	269 // Getting zoom mode property:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	270 octave_value ov_zm
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	271 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	272
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	273 octave_scalar_map zm = ov_zm.scalar_map_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	274
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	275 return zm.contents ("Enable").string_value () == "on";
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	276 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	277
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	278 static std::string
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	279 zoom_mode (const graphics_object figObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	280 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	281 // Getting zoom mode property:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	282 octave_value ov_zm
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	283 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	284
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	285 octave_scalar_map zm = ov_zm.scalar_map_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	286
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	287 return zm.contents ("Motion").string_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	288 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	289
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	290 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	291 Canvas::select_object (graphics_object obj, QMouseEvent *event,
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23364 diff changeset	292 graphics_object& currentObj, graphics_object& axesObj,
23185 0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	293 bool axes_only, std::vector<std::string> omit)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	294 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	295 QList<graphics_object> axesList;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	296 Matrix children = obj.get_properties ().get_all_children ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	297 octave_idx_type num_children = children.numel ();
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	298
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	299 for (int i = 0; i < num_children; i++)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	300 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	301 graphics_object childObj (gh_manager::get_object (children(i)));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	302
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	303 if (childObj.isa ("axes"))
23185 0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	304 {
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	305 auto p = omit.begin ();
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	306 bool omitfound = false;
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	307 while (p != omit.end () && ! omitfound)
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	308 {
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	309 omitfound = (childObj.get ("tag").string_value () == *p);
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	310 p++;
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	311 }
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	312 if (! omitfound)
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	313 axesList.append (childObj);
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	314 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	315 else if (childObj.isa ("uicontrol") \|\| childObj.isa ("uipanel")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 25951 diff changeset	316 \|\| childObj.isa ("uibuttongroup") \|\| childObj.isa ("uitable"))
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	317 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	318 Matrix bb = childObj.get_properties ().get_boundingbox (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	319 QRectF r (bb(0), bb(1), bb(2), bb(3));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	320
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	321 r.adjust (-5, -5, 5, 5);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	322
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	323 #if defined (HAVE_QMOUSEEVENT_LOCALPOS)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	324 bool rect_contains_pos = r.contains (event->localPos ());
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	325 #else
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	326 bool rect_contains_pos = r.contains (event->posF ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	327 #endif
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	328 if (rect_contains_pos)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	329 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	330 currentObj = childObj;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	331 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	332 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	333 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	334 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	335
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	336 if (axes_only)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	337 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	338 QPoint pt = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	339
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	340 for (QList<graphics_object>::ConstIterator it = axesList.begin ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	341 it != axesList.end (); ++it)
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	342 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	343 const axes::properties& ap =
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	344 dynamic_cast<const axes::properties&> ((*it).get_properties ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	345
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	346 ColumnVector p0 = ap.pixel2coord (pt.x (), pt.y ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	347 Matrix xlim = ap.get_xlim ().matrix_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	348 Matrix ylim = ap.get_ylim ().matrix_value ();
20245 a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20244 diff changeset	349
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	350 if (xlim(0) < p0(0) && xlim(1) > p0(0)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	351 && ylim(0) < p0(1) && ylim(1) > p0(1))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	352 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	353 axesObj = *it;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	354 return;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	355 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	356 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	357 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	358 else if (! currentObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	359 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	360 for (QList<graphics_object>::ConstIterator it = axesList.begin ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	361 it != axesList.end (); ++it)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	362 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	363 graphics_object go = selectFromAxes (*it, event->pos ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	364
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	365 if (go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	366 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	367 currentObj = go;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	368 axesObj = *it;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	369 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	370 // FIXME: is this really necessary? the axes object should
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	371 // have been selected through selectFromAxes anyway
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	372 else if (it->get_properties ().is_hittest ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	373 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	374 Matrix bb = it->get_properties ().get_boundingbox (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	375 QRectF r (bb(0), bb(1), bb(2), bb(3));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	376
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	377 #if defined (HAVE_QMOUSEEVENT_LOCALPOS)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	378 bool rect_contains_pos = r.contains (event->localPos ());
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24798 diff changeset	379 #else
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	380 bool rect_contains_pos = r.contains (event->posF ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	381 #endif
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	382 if (rect_contains_pos)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	383 axesObj = *it;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	384 }
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	385
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	386 if (axesObj && currentObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	387 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	388 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	389 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	390 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	391
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	392 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	393 Canvas::canvasMouseMoveEvent (QMouseEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	394 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	395 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	396 graphics_object ax = gh_manager::get_object (m_mouseAxes);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	397
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	398 if (m_mouseMode != NoMode && (ax.valid_object () \|\| m_mouseMode == TextMode))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	399 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	400 switch (m_mouseMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	401 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	402 case RotateMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	403 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	404 axes::properties& ap = Utils::properties<axes> (ax);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	405
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	406 ap.rotate3d (m_mouseCurrent.x (), event->x (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	407 m_mouseCurrent.y (), event->y ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	408
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	409 // Update current mouse position
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	410 m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	411
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	412 // Force immediate redraw
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	413 redraw (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	414 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	415 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	416 case TextMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	417 case ZoomInMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	418 case ZoomOutMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	419 m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	420 redraw (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	421 break;
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	422
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	423 case PanMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	424 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	425 axes::properties& ap = Utils::properties<axes> (ax);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	426
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	427 graphics_object figObj (ax.get_ancestor ("figure"));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	428
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	429 std::string mode = pan_mode (figObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	430
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	431 ColumnVector p0 = ap.pixel2coord (m_mouseCurrent.x (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	432 m_mouseCurrent.y ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	433 ColumnVector p1 = ap.pixel2coord (event->x (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	434 event->y ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	435
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	436 ap.translate_view (mode, p0(0), p1(0), p0(1), p1(1));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	437
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	438 // Update current mouse position
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	439 m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	440
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	441 // Force immediate redraw
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	442 redraw (true);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	443 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	444
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	445 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	446 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	447 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	448 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	449 else if (m_mouseMode == NoMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	450 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	451 graphics_object obj = gh_manager::get_object (m_handle);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	452
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	453 if (obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	454 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	455 graphics_object figObj (obj.get_ancestor ("figure"));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	456
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	457 if (figObj.valid_object ()
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	458 && ! figObj.get ("windowbuttonmotionfcn").isempty ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	459 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	460 updateCurrentPoint (figObj, obj, event);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	461 gh_manager::post_callback (figObj.get_handle (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	462 "windowbuttonmotionfcn");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	463 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	464 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	465 }
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	466
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	467 // Update mouse coordinates in the figure window status bar
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	468 graphics_object obj = gh_manager::get_object (m_handle);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	469 graphics_object figObj = obj.get_ancestor ("figure");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	470
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	471 if (figObj.valid_object () && obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	472 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	473 graphics_object currentObj, axesObj;
23185 0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	474 std::vector<std::string> omit = {"legend", "colorbar", "scribeoverlay"};
0032c2f7ee4e Don't display legend, colorbar, and annotation axes coordinates (bug #50272). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23083 diff changeset	475 select_object (obj, event, currentObj, axesObj, true, omit);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	476
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	477 if (axesObj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	478 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	479 // FIXME: should we use signal/slot mechanism instead of
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	480 // directly calling parent fig methods
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	481 Figure *fig =
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23433 diff changeset	482 dynamic_cast<Figure *> (Backend::toolkitObject (figObj));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	483 axes::properties& ap = Utils::properties<axes> (axesObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	484
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	485 if (fig)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	486 fig->updateStatusBar (ap.pixel2coord (event->x (), event->y ()));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	487 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	488 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	489 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	490
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	491 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	492 Canvas::canvasMouseDoubleClickEvent (QMouseEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	493 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	494 // same processing as normal click, but event type is MouseButtonDblClick
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	495 canvasMousePressEvent (event);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	496 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	497
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	498 static double
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	499 button_number (QMouseEvent *event)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	500 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	501 double retval = 0;
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	502
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	503 switch (event->button ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	504 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	505 case Qt::LeftButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	506 retval = 1;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	507 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	508
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	509 case Qt::MidButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	510 retval = 2;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	511 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	512
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	513 case Qt::RightButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	514 retval = 3;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	515 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	516
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	517 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	518 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	519 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	520
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	521 return retval;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	522 }
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	523
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	524 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	525 Canvas::canvasMousePressEvent (QMouseEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	526 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	527 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	528 graphics_object obj = gh_manager::get_object (m_handle);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	529
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	530 bool isdblclick = (event->type () == QEvent::MouseButtonDblClick);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	531
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	532 if (obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	533 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	534 graphics_object figObj (obj.get_ancestor ("figure"));
23360 43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	535
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	536 // Any click in a figure canvas makes it current
23360 43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	537 if (figObj)
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	538 {
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	539 graphics_object root = gh_manager::get_object (0);
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	540 Utils::properties<root_figure> (root)
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	541 .set_currentfigure (figObj.get_handle ().as_octave_value ());
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	542 }
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	543
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	544 graphics_object currentObj, axesObj;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	545
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	546 // Retrieve selected object.
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	547 select_object (obj, event, currentObj, axesObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	548
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	549 // currentObj may be invalid if, e.g., all objects under the mouse
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	550 // click had "hittest" -> "off" or "pickableparts" -> "none". In that
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	551 // case, replace with underlying figObj which always accepts mouse
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	552 // clicks.
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	553 if (! currentObj.valid_object ())
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	554 currentObj = figObj;
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	555 else if (! currentObj.get_properties ().is_hittest ())
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	556 {
24672 13c207835e79 Rethrow gl2ps_print exceptions from GUI to interpreter thread (bug #50198) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24636 diff changeset	557 // Objects with "hittest"->"off" pass the mouse event to their
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	558 // parent and so on.
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	559 graphics_object tmpgo;
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	560 tmpgo = gh_manager::get_object (currentObj.get_parent ());
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	561 while (tmpgo && ! tmpgo.get_properties ().is_hittest ())
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	562 tmpgo = gh_manager::get_object (tmpgo.get_parent ());
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	563
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	564 if (tmpgo && tmpgo.get_handle () != 0.0)
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	565 currentObj = tmpgo;
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	566 else
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	567 currentObj = graphics_object ();
9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	568 }
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	569
26861 6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	570 // Make selected axes current
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	571 bool valid_axes = axesObj.valid_object ()
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	572 && axesObj.get_properties ().handlevisibility_is ("on")
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	573 && axesObj.get_properties ().get_tag () != "legend"
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	574 && axesObj.get_properties ().get_tag () != "colorbar";
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26869 diff changeset	575
26861 6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	576 if (valid_axes)
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	577 Utils::properties<figure> (figObj)
6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	578 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
19887 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19870 diff changeset	579
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	580 Figure fig = dynamic_cast<Figure > (Backend::toolkitObject (figObj));
19765 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19762 diff changeset	581
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	582 MouseMode newMouseMode = NoMode;
19782 98cc7c741c5a avoid GCC warning about enumeration values not handled in switch statement John W. Eaton <jwe@octave.org> parents: 19765 diff changeset	583
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	584 if (fig)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	585 newMouseMode = fig->mouseMode ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	586
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	587 switch (newMouseMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	588 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	589 case NoMode:
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	590 {
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	591 // Update the figure "currentobject"
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	592 auto& fprop = Utils::properties<figure> (figObj);
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	593
24672 13c207835e79 Rethrow gl2ps_print exceptions from GUI to interpreter thread (bug #50198) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24636 diff changeset	594 if (currentObj
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	595 && currentObj.get_properties ().handlevisibility_is ("on"))
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	596 fprop.set_currentobject (currentObj.get_handle ()
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	597 .as_octave_value ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	598 else
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	599 fprop.set_currentobject (Matrix ());
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	600
ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	601 // Update figure "selectiontype" and "currentpoint"
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	602 gh_manager::post_set (
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	603 figObj.get_handle (), "selectiontype",
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	604 Utils::figureSelectionType (event, isdblclick), false);
19765 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19762 diff changeset	605
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	606 updateCurrentPoint (figObj, obj, event);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	607
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	608 gh_manager::post_callback (figObj.get_handle (),
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	609 "windowbuttondownfcn",
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	610 button_number (event));
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	611
24743 f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	612 // Execute the "buttondownfcn" of the selected object. If the
f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	613 // latter is empty then execute the figure "buttondownfcn"
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	614 if (currentObj && ! currentObj.get ("buttondownfcn").isempty ())
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	615 gh_manager::post_callback (currentObj.get_handle (),
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	616 "buttondownfcn",
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	617 button_number (event));
24743 f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	618 else if (figObj && ! figObj.get ("buttondownfcn").isempty ())
f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	619 gh_manager::post_callback (figObj.get_handle (),
f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	620 "buttondownfcn",
f7e333b12687 Ignore figure "hittest" for executing "buttondownfcn" (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24672 diff changeset	621 button_number (event));
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	622
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	623 // Show context menu of the selected object
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	624 if (currentObj && event->button () == Qt::RightButton)
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	625 ContextMenu::executeAt (currentObj.get_properties (),
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	626 event->globalPos ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	627 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	628 break;
20009 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20006 diff changeset	629
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	630 case TextMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	631 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	632 if (event->modifiers () == Qt::NoModifier)
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	633 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	634 switch (event->buttons ())
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	635 {
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	636 case Qt::LeftButton:
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	637 m_mouseAnchor = m_mouseCurrent = event->pos ();
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	638 m_mouseMode = newMouseMode;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	639 m_rectMode = true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	640 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	641 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	642 redraw (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	643 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	644 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	645
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	646 case PanMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	647 case RotateMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	648 case ZoomInMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	649 case ZoomOutMode:
26861 6236c790bd1b Disalow zoom/pan/rotate on legend and colorbar axes (bug #55848) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26511 diff changeset	650 if (valid_axes)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	651 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	652 bool redraw_figure = true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	653
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	654 if (isdblclick)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	655 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	656 if (event->button () == Qt::LeftButton)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	657 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	658 axes::properties& ap = Utils::properties<axes> (axesObj);
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	659
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	660 autoscale_axes (ap);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	661 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	662 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	663 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	664 redraw_figure = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	665 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	666 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	667 else if (event->modifiers () == Qt::NoModifier)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	668 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	669 switch (event->buttons ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	670 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	671 case Qt::LeftButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	672 m_mouseAnchor = m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	673 m_mouseAxes = axesObj.get_handle ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	674 m_mouseMode = newMouseMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	675 m_clickMode = newMouseMode == ZoomInMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	676 break;
20090 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20080 diff changeset	677
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	678 case Qt::RightButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	679 if (newMouseMode == ZoomInMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	680 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	681 m_mouseAnchor = m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	682 m_mouseAxes = axesObj.get_handle ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	683 m_mouseMode = newMouseMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	684 m_clickMode = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	685 }
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	686
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	687 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	688
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	689 case Qt::MidButton:
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	690 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	691 axes::properties& ap =
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	692 Utils::properties<axes> (axesObj);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	693
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	694 autoscale_axes (ap);
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	695 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	696 break;
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	697
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	698 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	699 redraw_figure = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	700 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	701 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	702 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	703 else if (event->modifiers () == Qt::ShiftModifier)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	704 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	705 switch (event->buttons ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	706 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	707 case Qt::LeftButton:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	708 if (newMouseMode == ZoomInMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	709 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	710 m_mouseAnchor = m_mouseCurrent = event->pos ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	711 m_mouseAxes = axesObj.get_handle ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	712 m_mouseMode = newMouseMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	713 m_clickMode = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	714 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	715 break;
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	716
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	717 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	718 redraw_figure = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	719 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	720 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	721 }
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	722
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	723 if (redraw_figure)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	724 redraw (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	725 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	726 break;
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	727
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	728 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	729 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	730 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	731 }
20009 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20006 diff changeset	732
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	733 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	734
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	735 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	736 Canvas::canvasMouseReleaseEvent (QMouseEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	737 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	738 if ((m_mouseMode == ZoomInMode \|\| m_mouseMode == ZoomOutMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	739 && m_mouseAxes.ok ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	740 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	741 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	742 graphics_object ax = gh_manager::get_object (m_mouseAxes);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	743
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	744 if (ax.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	745 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	746 axes::properties& ap = Utils::properties<axes> (ax);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	747
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	748 graphics_object obj = gh_manager::get_object (m_handle);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	749
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	750 graphics_object figObj (obj.get_ancestor ("figure"));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	751
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	752 std::string zm = zoom_mode (figObj);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	753
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	754 if (m_mouseAnchor == event->pos ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	755 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	756 double factor = (m_clickMode ? 2.0 : 0.5);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	757
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	758 ColumnVector p1 = ap.pixel2coord (event->x (), event->y ());
19894 ac18e88ea1bf zoom about point for single clicks John W. Eaton <jwe@octave.org> parents: 19887 diff changeset	759
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	760 ap.zoom_about_point (zm, p1(0), p1(1), factor);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	761 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	762 else if (m_mouseMode == ZoomInMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	763 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	764 ColumnVector p0 = ap.pixel2coord (m_mouseAnchor.x (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	765 m_mouseAnchor.y ());
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	766 ColumnVector p1 = ap.pixel2coord (event->x (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	767 event->y ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	768
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	769 Matrix xl (1, 2, 0.0);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	770 Matrix yl (1, 2, 0.0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	771
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	772 xl(0) = std::min (p0(0), p1(0));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	773 xl(1) = std::max (p0(0), p1(0));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	774 yl(0) = std::min (p0(1), p1(1));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	775 yl(1) = std::max (p0(1), p1(1));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	776
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	777 ap.zoom (zm, xl, yl);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	778 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	779
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	780 redraw (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	781 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	782 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	783 else if (m_mouseMode == NoMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	784 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	785 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	786 graphics_object obj = gh_manager::get_object (m_handle);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	787
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	788 if (obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	789 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	790 graphics_object figObj (obj.get_ancestor ("figure"));
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: 22323 diff changeset	792 updateCurrentPoint (figObj, obj, event);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	793 gh_manager::post_callback (figObj.get_handle (),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	794 "windowbuttonupfcn");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	795 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	796 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	797 else if (m_mouseMode == TextMode)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	798 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	799 gh_manager::auto_lock lock;
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20110 diff changeset	800
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	801 graphics_object figObj =
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	802 gh_manager::get_object (m_handle).get_ancestor ("figure");
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	803 if (figObj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	804 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	805 QWidget *w = qWidget ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	806 if (w)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	807 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	808 Matrix bb = figObj.get ("position").matrix_value ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	809 bb(0) = m_mouseAnchor.x () / bb(2);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	810 bb(1) = 1.0 - (m_mouseAnchor.y () / bb(3));
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	811 bb(2) = (event->x () - m_mouseAnchor.x ()) / bb(2);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	812 bb(3) = (m_mouseAnchor.y () - event->y ()) / bb(3);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	813
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	814 octave_value_list props = ovl ("textbox", bb);
20107 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20106 diff changeset	815
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	816 annotation_dialog anno_dlg (w, props);
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20110 diff changeset	817
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	818 if (anno_dlg.exec () == QDialog::Accepted)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	819 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	820 props = anno_dlg.get_properties ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	821 props.prepend (figObj.get_handle ().as_octave_value ());
20107 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20106 diff changeset	822
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	823 octave_link::post_event (this, &Canvas::annotation_callback,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	824 props);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	825 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	826 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	827 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	828 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	829 m_rectMode = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	830 m_mouseAxes = graphics_handle ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	831 m_mouseMode = NoMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	832 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	833
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	834 void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	835 Canvas::canvasWheelEvent (QWheelEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	836 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	837 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	838 graphics_object obj = gh_manager::get_object (m_handle);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	839
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	840 if (obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	841 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	842 std::string mode;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	843
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	844 graphics_object axesObj;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	845
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	846 Matrix children = obj.get_properties ().get_children ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	847 octave_idx_type num_children = children.numel ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	848
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	849 for (int i = 0; i < num_children; i++)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	850 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	851 graphics_object childObj (gh_manager::get_object (children(i)));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	852
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	853 if (childObj.isa ("axes"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	854 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	855 graphics_object go = selectFromAxes (childObj, event->pos ());
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	856
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	857 if (go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	858 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	859 axesObj = childObj;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	860 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	861 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	862 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	863 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	864
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	865 if (axesObj)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	866 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	867 MouseMode newMouseMode = NoMode;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	868
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	869 graphics_object figObj (obj.get_ancestor ("figure"));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	870
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	871 Figure fig = dynamic_cast<Figure > (Backend::toolkitObject (figObj));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	872
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	873 if (fig)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	874 newMouseMode = fig->mouseMode ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	875
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	876 if (axesObj.get_properties ().handlevisibility_is ("on"))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	877 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	878 Utils::properties<figure> (figObj)
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	879 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	880
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	881 if (zoom_enabled (figObj))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	882 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	883 if (event->delta () > 0)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	884 newMouseMode = ZoomInMode;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	885 else
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	886 newMouseMode = ZoomOutMode;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	887
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	888 mode = zoom_mode (figObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	889 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	890 else if (pan_enabled (figObj))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	891 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	892 newMouseMode = PanMode;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	893
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	894 mode = pan_mode (figObj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	895 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	896 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	897
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	898 bool redrawFigure = true;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	899
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	900 switch (newMouseMode)
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	901 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	902 case ZoomInMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	903 case ZoomOutMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	904 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	905 axes::properties& ap = Utils::properties<axes> (axesObj);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	906
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	907 // Control how fast to zoom when using scroll wheel.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	908 double wheel_zoom_speed = ap.get_mousewheelzoom ();
19759 ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	909
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	910 // Determine if we're zooming in or out.
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	911 double factor = (newMouseMode == ZoomInMode
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	912 ? 1 / (1.0 - wheel_zoom_speed)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	913 : 1.0 - wheel_zoom_speed);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	914
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	915 // FIXME: should we zoom about point for 2D plots?
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	916
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	917 ap.zoom (mode, factor);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	918 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	919 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	920
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	921 case PanMode:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	922 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	923 axes::properties& ap = Utils::properties<axes> (axesObj);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	924
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	925 double factor = (event->delta () > 0 ? 0.1 : -0.1);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	926
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	927 if (event->modifiers () == Qt::NoModifier
24372 708b98b4cdd1 Make wheel scroll behave more consistently in pan mode (bug #52588). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23360 diff changeset	928 && mode != "horizontal")
708b98b4cdd1 Make wheel scroll behave more consistently in pan mode (bug #52588). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23360 diff changeset	929 ap.pan ("vertical", factor);
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	930 else if (event->modifiers () == Qt::ShiftModifier
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	931 && mode != "vertical")
24372 708b98b4cdd1 Make wheel scroll behave more consistently in pan mode (bug #52588). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23360 diff changeset	932 ap.pan ("horizontal", factor);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	933 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	934 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	935
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	936 default:
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	937 redrawFigure = false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	938 break;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	939 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	940
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	941 if (redrawFigure)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	942 redraw (false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	943 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	944 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	945 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	946
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	947 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	948 Canvas::canvasKeyPressEvent (QKeyEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	949 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	950 if (m_eventMask & KeyPress)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	951 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	952 gh_manager::auto_lock lock;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	953 graphics_object obj = gh_manager::get_object (m_handle);
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	954
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	955 if (obj.valid_object ())
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	956 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	957 graphics_object figObj (obj.get_ancestor ("figure"));
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	958
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	959 updateCurrentPoint (figObj, obj);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	960 }
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	961
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	962 octave_scalar_map eventData = Utils::makeKeyEventStruct (event);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	963
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	964 gh_manager::post_set (m_handle, "currentcharacter",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	965 eventData.getfield ("Character"), false);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	966 gh_manager::post_callback (m_handle, "keypressfcn", eventData);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	967
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	968 return true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	969 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	970
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	971 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	972 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	973
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	974 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	975 Canvas::canvasKeyReleaseEvent (QKeyEvent *event)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	976 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	977 if (! event->isAutoRepeat () && (m_eventMask & KeyRelease))
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	978 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	979 gh_manager::post_callback (m_handle, "keyreleasefcn",
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	980 Utils::makeKeyEventStruct (event));
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	981
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	982 return true;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	983 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	984
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	985 return false;
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	986 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	987
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	988 Canvas*
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	989 Canvas::create (const std::string& /* name /, QWidget parent,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	990 const graphics_handle& handle)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	991 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	992 // Only OpenGL
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	993 return new GLCanvas (parent, handle);
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	994 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	995
22413 8758addcf265 maint: Remove ';' at end of namespace declaration. Rik <rik@octave.org> parents: 22411 diff changeset	996 }

Mercurial > octave

annotate libgui/graphics/Canvas.cc @ 27020:30e9204de313