octave: libgui/graphics/Canvas.cc annotate

annotate libgui/graphics/Canvas.cc @ 33634:4a70f390c85e default tip @

maint: Merge stable to default.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Tue, 28 May 2024 15:25:54 +0200
parents	7f18c537e101
children

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32390 diff changeset	3 // Copyright (C) 2011-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include <QApplication>
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	31 #include <QBitmap>
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	32 #include <QCursor>
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	33 #include <QInputDialog>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QList>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include <QMouseEvent>
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	36 #include <QWheelEvent>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include <QRectF>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	38
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "Canvas.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "ContextMenu.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41 #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	42 #include "QtHandlesUtils.h"
27317 718116e9c7d3 rename Backend to qt_graphics_toolkit John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	43 #include "qt-graphics-toolkit.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	44
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20090 diff changeset	45 #include "annotation-dialog.h"
31621 0645ea65ca6b handle icons and themes in gui_settings class, not resource_manager John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	46 #include "gui-settings.h"
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	47 #include "qt-interpreter-events.h"
20095 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20090 diff changeset	48
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	49 #include "builtin-defun-decls.h"
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	50 #include "graphics.h"
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	51 #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	52 #include "oct-opengl.h"
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	53
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	54 OCTAVE_BEGIN_NAMESPACE(octave)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	55
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	56 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	57 Canvas::redraw (bool sync)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	58 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	59 QWidget *w = qWidget ();
19953 ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19896 diff changeset	60
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	61 if (w)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	62 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	63 if (sync)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	64 w->repaint ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	65 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	66 w->update ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	67 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	68 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	69
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	70 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	71 Canvas::blockRedraw (bool block)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	72 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	73 m_redrawBlocked = block;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	74 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	75
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	76 QCursor
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	77 Canvas::make_cursor (const QString& name, int hot_x, int hot_y)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	78 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	79 gui_settings settings;
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	80
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	81 QIcon icon = settings.icon (name);
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	82
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	83 return QCursor (icon.pixmap (22, 22), hot_x, hot_y);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	84 }
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	85
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	86 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	87 Canvas::setCursor (MouseMode mode, std::string fallback,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	88 QImage cdata, Matrix hotspot)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	89 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	90 QWidget *w = qWidget ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	91 QCursor cursor = Qt::ArrowCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	92 if (w)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	93 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	94 switch (mode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	95 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	96 case NoMode:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	97 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	98 cursor = Qt::ArrowCursor;
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27020 diff changeset	99
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	100 if (fallback == "arrow")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	101 cursor = Qt::ArrowCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	102 else if (fallback == "botl")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	103 cursor = make_cursor ("bottom_left_corner", 5, 16);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	104 else if (fallback == "botr")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	105 cursor = make_cursor ("bottom_right_corner", 16, 16);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	106 else if (fallback == "bottom")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	107 cursor = make_cursor ("bottom_side", 11, 16);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	108 else if (fallback == "circle")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	109 cursor = make_cursor ("circle", 10, 10);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	110 else if (fallback == "cross" \|\| fallback == "crosshair")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	111 cursor = make_cursor ("cross", 10, 10);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	112 else if (fallback == "custom")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	113 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	114 if (hotspot(0) > cdata.width () \|\| hotspot(0) < 1.0
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	115 \|\| hotspot(1) > cdata.height () \|\| hotspot(1) < 1.0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	116 hotspot = Matrix (1, 2, 1);
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27020 diff changeset	117
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	118 cursor = QCursor (QPixmap::fromImage (cdata),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	119 static_cast<int> (hotspot(1) - 1),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	120 static_cast<int> (hotspot(0) - 1));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	121 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	122 else if (fallback == "fleur")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	123 cursor = make_cursor ("fleur", 10, 4);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	124 else if (fallback == "hand")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	125 cursor = make_cursor ("hand2", 7, 3);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	126 else if (fallback == "ibeam")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	127 cursor = Qt::IBeamCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	128 else if (fallback == "left")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	129 cursor = make_cursor ("left_side", 4, 10);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	130 else if (fallback == "right")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	131 cursor = make_cursor ("right_side", 17, 10);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	132 else if (fallback == "top")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	133 cursor = make_cursor ("top_side", 11, 4);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	134 else if (fallback == "topl")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	135 cursor = make_cursor ("top_left_corner", 4, 4);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	136 else if (fallback == "topr")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	137 cursor = make_cursor ("top_right_corner", 16, 4);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	138 else if (fallback == "watch")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	139 cursor = Qt::BusyCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	140 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	141 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	142 case SelectMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	143 cursor = Qt::ArrowCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	144 break;
19681 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19663 diff changeset	145
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	146 case PanMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	147 cursor = make_cursor ("figure-pan");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	148 break;
19954 b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19953 diff changeset	149
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	150 case RotateMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	151 cursor = make_cursor ("figure-rotate");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	152 break;
18612 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	153
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	154 case TextMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	155 cursor = Qt::IBeamCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	156 break;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	157
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	158 case ZoomInMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	159 cursor = make_cursor ("figure-zoom-in", 9, 9);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	160 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	161
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	162 case ZoomOutMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	163 cursor = make_cursor ("figure-zoom-out", 9, 9);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	164 break;
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	165
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	166 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	167 cursor = Qt::ArrowCursor;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	168 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	169 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	170 w->setCursor (cursor);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	171 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	172 }
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	173
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	174 /*
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	175 Two updateCurrentPoint() routines are required:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	176 1) Used for QMouseEvents where cursor position data is in callback from Qt.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	177 2) Used for QKeyEvents where cursor position must be determined.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	178 */
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	179 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	180 Canvas::updateCurrentPoint (const graphics_object& fig,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	181 const graphics_object& obj, QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	182 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	183 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
20080 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20040 diff changeset	184
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	185 octave::autolock guard (gh_mgr.graphics_lock ());
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20110 diff changeset	186
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	187 Q_EMIT gh_set_event (fig.get_handle (), "currentpoint",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	188 Utils::figureCurrentPoint (fig, event), false);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	189
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	190 Matrix children = obj.get_properties ().get_children ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	191 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	192
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	193 for (int i = 0; i < num_children; i++)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	194 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	195 graphics_object childObj (gh_mgr.get_object (children(i)));
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	196
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	197 if (childObj.isa ("axes"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	198 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	199 axes::properties& ap = Utils::properties<axes> (childObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	200 Matrix x_zlim = ap.get_transform_zlim ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	201 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	202
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	203 QPoint mouse_position = event->pos ();
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	204 ColumnVector p1
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	205 = x_form.untransform (mouse_position.x (), mouse_position.y (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	206 x_zlim(0));
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	207 ColumnVector p2
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	208 = x_form.untransform (mouse_position.x (), mouse_position.y (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	209 x_zlim(1));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	210
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	211 Matrix cp (2, 3, 0.0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	212
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	213 cp(0, 0) = p1(0); cp(0, 1) = p1(1); cp(0, 2) = p1(2);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	214 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	215
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	216 Q_EMIT gh_set_event (childObj.get_handle (), "currentpoint", cp,
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	217 false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	218 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	219 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	220 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	221
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	222 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	223 Canvas::updateCurrentPoint (const graphics_object& fig,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	224 const graphics_object& obj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	225 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	226 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	227
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	228 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	229
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	230 Q_EMIT gh_set_event (fig.get_handle (), "currentpoint",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	231 Utils::figureCurrentPoint (fig), false);
19870 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19867 diff changeset	232
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	233 Matrix children = obj.get_properties ().get_children ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	234 octave_idx_type num_children = children.numel ();
26511 7bf8036ad3f6 Fix error when performing autoscale from Qt figures (bug #54920) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26376 diff changeset	235
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	236 for (int i = 0; i < num_children; i++)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	237 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	238 graphics_object childObj (gh_mgr.get_object (children(i)));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	239
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	240 if (childObj.isa ("axes"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	241 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	242 // FIXME: QCursor::pos() may give inaccurate results with
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	243 // asynchronous window systems like X11 over ssh.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	244 QWidget *w = qWidget ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	245 QPoint p = w->mapFromGlobal (QCursor::pos ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	246 axes::properties& ap = Utils::properties<axes> (childObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	247 Matrix x_zlim = ap.get_transform_zlim ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	248 graphics_xform x_form = ap.get_transform ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	249
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	250 ColumnVector p1 = x_form.untransform (p.x (), p.y (), x_zlim(0));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	251 ColumnVector p2 = x_form.untransform (p.x (), p.y (), x_zlim(1));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	252
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	253 Matrix cp (2, 3, 0.0);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	254
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	255 cp(0, 0) = p1(0); cp(0, 1) = p1(1); cp(0, 2) = p1(2);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	256 cp(1, 0) = p2(0); cp(1, 1) = p2(1); cp(1, 2) = p2(2);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	257
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	258 Q_EMIT gh_set_event (childObj.get_handle (), "currentpoint", cp,
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	259 false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	260 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	261 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	262 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	263
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	264 static void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	265 autoscale_axes (gh_manager& gh_mgr, axes::properties& ap)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	266 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	267 octave::autolock guard (gh_mgr.graphics_lock ());
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	268
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	269 // Reset zoom stack
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	270 ap.clear_zoom_stack (false);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	271
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	272 ap.set_xlimmode ("auto");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	273 ap.set_ylimmode ("auto");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	274 ap.set_zlimmode ("auto");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	275 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	276
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	277 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	278 Canvas::canvasPaintEvent ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	279 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	280 if (! m_redrawBlocked)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	281 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	282 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	283
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	284 octave::autolock guard (gh_mgr.graphics_lock ());
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	285
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	286 draw (m_handle);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	287
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	288 if ((m_mouseMode == ZoomInMode && m_mouseAxes.ok ()) \|\| m_rectMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	289 drawZoomBox (m_mouseAnchor, m_mouseCurrent);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	290 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	291 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	292
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	293 static bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	294 pan_enabled (const graphics_object figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	295 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	296 // Getting pan mode property:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	297 octave_value ov_pm
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	298 = Utils::properties<figure> (figObj).get___pan_mode__ ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	299
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	300 octave_scalar_map pm = ov_pm.scalar_map_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	301
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	302 return pm.contents ("Enable").string_value () == "on";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	303 }
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	304
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	305 static std::string
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	306 pan_mode (const graphics_object figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	307 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	308 // Getting pan mode property:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	309 octave_value ov_pm
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	310 = Utils::properties<figure> (figObj).get___pan_mode__ ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	311
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	312 octave_scalar_map pm = ov_pm.scalar_map_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	313
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	314 return pm.contents ("Motion").string_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	315 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	316
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	317 static bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	318 zoom_enabled (const graphics_object figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	319 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	320 // Getting zoom mode property:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	321 octave_value ov_zm
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	322 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	323
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	324 octave_scalar_map zm = ov_zm.scalar_map_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	325
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	326 return zm.contents ("Enable").string_value () == "on";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	327 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	328
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	329 static std::string
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	330 zoom_mode (const graphics_object figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	331 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	332 // Getting zoom mode property:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	333 octave_value ov_zm
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	334 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	335
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	336 octave_scalar_map zm = ov_zm.scalar_map_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	337
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	338 return zm.contents ("Motion").string_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	339 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	340
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	341 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	342 Canvas::select_object (graphics_object obj, QMouseEvent *event,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	343 graphics_object& currentObj, graphics_object& axesObj,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	344 bool axes_only, std::vector<std::string> omit)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	345 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	346 QList<graphics_object> axesList;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	347 Matrix children = obj.get_properties ().get_all_children ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	348 octave_idx_type num_children = children.numel ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	349
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	350 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	351
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	352 for (int i = 0; i < num_children; i++)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	353 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	354 graphics_object childObj (gh_mgr.get_object (children(i)));
20245 a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20244 diff changeset	355
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	356 if (childObj.isa ("axes"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	357 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	358 auto p = omit.begin ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	359 bool omitfound = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	360 while (p != omit.end () && ! omitfound)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	361 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	362 omitfound = (childObj.get ("tag").string_value () == *p);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	363 p++;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	364 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	365 if (! omitfound)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	366 axesList.append (childObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	367 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	368 else if (childObj.isa ("uicontrol") \|\| childObj.isa ("uipanel")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	369 \|\| childObj.isa ("uibuttongroup") \|\| childObj.isa ("uitable"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	370 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	371 Matrix bb = childObj.get_properties ().get_boundingbox (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	372 QRectF r (bb(0), bb(1), bb(2), bb(3));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	373
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	374 r.adjust (-5, -5, 5, 5);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	375
32390 811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	376 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	377 QPointF mouse_pos = event->position ();
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	378 #else
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	379 QPointF mouse_pos = event->localPos ();
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	380 #endif
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	381 bool rect_contains_pos = r.contains (mouse_pos);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	382 if (rect_contains_pos)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	383 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	384 currentObj = childObj;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	385 break;
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	386 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	387 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	388 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	389
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	390 if (axes_only)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	391 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	392 QPoint pt = event->pos ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	393
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	394 for (QList<graphics_object>::ConstIterator it = axesList.begin ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	395 it != axesList.end (); ++it)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	396 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	397 const axes::properties& ap =
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	398 dynamic_cast<const axes::properties&> ((*it).get_properties ());
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	399
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	400 ColumnVector p0 = ap.pixel2coord (pt.x (), pt.y ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	401 Matrix xlim = ap.get_xlim ().matrix_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	402 Matrix ylim = ap.get_ylim ().matrix_value ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	403
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	404 if (xlim(0) < p0(0) && xlim(1) > p0(0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	405 && ylim(0) < p0(1) && ylim(1) > p0(1))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	406 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	407 axesObj = *it;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	408 return;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	409 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	410 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	411 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	412 else if (! currentObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	413 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	414 for (QList<graphics_object>::ConstIterator it = axesList.begin ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	415 it != axesList.end (); ++it)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	416 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	417 graphics_object go = selectFromAxes (*it, event->pos ());
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	418
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	419 if (go)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	420 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	421 currentObj = go;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	422 axesObj = *it;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	423 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	424 // FIXME: is this really necessary? the axes object should
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	425 // have been selected through selectFromAxes anyway
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	426 else if (it->get_properties ().is_hittest ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	427 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	428 Matrix bb = it->get_properties ().get_boundingbox (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	429 QRectF r (bb(0), bb(1), bb(2), bb(3));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	430
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	431 // Allow a rectangle (e.g., Zoom box) to be slightly outside
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	432 // the axes and still select it.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	433 r.adjust (-20, -20, 20, 20);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	434
32390 811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	435 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	436 QPointF mouse_pos = event->position ();
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	437 #else
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	438 QPointF mouse_pos = event->localPos ();
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	439 #endif
811e8088f0cd gui: Replace QMouseEvent::localPos() by QMouseEvent::position() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32388 diff changeset	440 bool rect_contains_pos = r.contains (mouse_pos);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	441 if (rect_contains_pos)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	442 axesObj = *it;
22411 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
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	445 if (axesObj && currentObj)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	446 break;
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	447 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	448 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	449 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	450
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	451 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	452 Canvas::canvasMouseMoveEvent (QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	453 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	454 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	455
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	456 octave::autolock guard (gh_mgr.graphics_lock ());
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	457
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	458 graphics_object ax = gh_mgr.get_object (m_mouseAxes);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	459
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	460 if (m_mouseMode != NoMode && (ax.valid_object () \|\| m_mouseMode == TextMode))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	461 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	462 switch (m_mouseMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	463 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	464 case RotateMode:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	465 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	466 axes::properties& ap = Utils::properties<axes> (ax);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	467
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	468 QPoint mouse_position = event->pos ();
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	469 ap.rotate3d (m_mouseCurrent.x (), mouse_position.x (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	470 m_mouseCurrent.y (), mouse_position.y ());
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	471
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	472 // Update current mouse position
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	473 m_mouseCurrent = event->pos ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	474
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	475 // Force immediate redraw
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	476 redraw (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	477 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	478 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	479 case TextMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	480 case ZoomInMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	481 case ZoomOutMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	482 m_mouseCurrent = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	483 redraw (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	484 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	485
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	486 case PanMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	487 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	488 axes::properties& ap = Utils::properties<axes> (ax);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	489
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	490 graphics_object figObj (ax.get_ancestor ("figure"));
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	491
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	492 std::string mode = pan_mode (figObj);
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	493
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	494 ColumnVector p0 = ap.pixel2coord (m_mouseCurrent.x (),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	495 m_mouseCurrent.y ());
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	496 QPoint mouse_position = event->pos ();
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	497 ColumnVector p1 = ap.pixel2coord (mouse_position.x (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	498 mouse_position.y ());
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	499
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	500 ap.translate_view (mode, p0(0), p1(0), p0(1), p1(1));
23360 43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	501
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	502 // Update current mouse position
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	503 m_mouseCurrent = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	504
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	505 // Force immediate redraw
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	506 redraw (true);
23360 43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	507 }
43f549ac6dac Let mouse selection of Qt figures update "currentfigure" (bug #50666) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23219 diff changeset	508
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	509 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	510 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	511 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	512 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	513 else if (m_mouseMode == NoMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	514 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	515 graphics_object obj = gh_mgr.get_object (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	516
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	517 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	518 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	519 graphics_object figObj (obj.get_ancestor ("figure"));
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	520
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	521 if (figObj.valid_object ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	522 && ! figObj.get ("windowbuttonmotionfcn").isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	523 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	524 updateCurrentPoint (figObj, obj, event);
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	525 Q_EMIT gh_callback_event (figObj.get_handle (),
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	526 "windowbuttonmotionfcn");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	527 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	528 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	529 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	530
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	531 // Update mouse coordinates in the figure window status bar
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	532 graphics_object obj = gh_mgr.get_object (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	533 graphics_object figObj = obj.get_ancestor ("figure");
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	534
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	535 if (figObj.valid_object () && obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	536 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	537 graphics_object currentObj, axesObj;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	538 std::vector<std::string> omit = {"legend", "colorbar", "scribeoverlay"};
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	539 select_object (obj, event, currentObj, axesObj, true, omit);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	540
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	541 if (axesObj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	542 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	543 // FIXME: should we use signal/slot mechanism instead of
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	544 // directly calling parent fig methods
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	545 Figure *fig =
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	546 dynamic_cast<Figure *> (qt_graphics_toolkit::toolkitObject (figObj));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	547 axes::properties& ap = Utils::properties<axes> (axesObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	548
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	549 if (fig)
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	550 {
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	551 QPoint mouse_position = event->pos ();
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	552 fig->updateStatusBar (ap.pixel2coord (mouse_position.x (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	553 mouse_position.y ()));
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	554 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	555 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	556 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	557 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	558
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	559 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	560 Canvas::canvasMouseDoubleClickEvent (QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	561 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	562 // same processing as normal click, but event type is MouseButtonDblClick
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	563 canvasMousePressEvent (event);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	564 }
24636 9d01ce02d5cb Make selection and "HitTest" compatible with Matlab (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24634 diff changeset	565
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	566 static double
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	567 button_number (QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	568 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	569 double retval = 0;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	570
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	571 switch (event->button ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	572 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	573 case Qt::LeftButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	574 retval = 1;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	575 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	576
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	577 case Qt::MiddleButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	578 retval = 2;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	579 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	580
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	581 case Qt::RightButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	582 retval = 3;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	583 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	584
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	585 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	586 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	587 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	588
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	589 return retval;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	590 }
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	591
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	592 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	593 Canvas::canvasMousePressEvent (QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	594 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	595 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	596
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	597 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	598
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	599 graphics_object obj = gh_mgr.get_object (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	600
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	601 bool isdblclick = (event->type () == QEvent::MouseButtonDblClick);
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26869 diff changeset	602
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	603 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	604 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	605 graphics_object figObj (obj.get_ancestor ("figure"));
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	606
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	607 // Any click in a figure canvas makes it current
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	608 if (figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	609 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	610 graphics_object root = gh_mgr.get_object (0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	611 Utils::properties<root_figure> (root)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	612 .set_currentfigure (figObj.get_handle ().as_octave_value ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	613 }
19765 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19762 diff changeset	614
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	615 graphics_object currentObj, axesObj;
19782 98cc7c741c5a avoid GCC warning about enumeration values not handled in switch statement John W. Eaton <jwe@octave.org> parents: 19765 diff changeset	616
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	617 // Retrieve selected object.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	618 select_object (obj, event, currentObj, axesObj);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	619
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	620 // currentObj may be invalid if, e.g., all objects under the mouse
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	621 // click had "hittest" -> "off" or "pickableparts" -> "none". In that
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	622 // case, replace with underlying figObj which always accepts mouse
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	623 // clicks.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	624 if (! currentObj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	625 currentObj = figObj;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	626 else if (! currentObj.get_properties ().is_hittest ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	627 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	628 // Objects with "hittest"->"off" pass the mouse event to their
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	629 // parent and so on.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	630 graphics_object tmpgo;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	631 tmpgo = gh_mgr.get_object (currentObj.get_parent ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	632 while (tmpgo && ! tmpgo.get_properties ().is_hittest ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	633 tmpgo = gh_mgr.get_object (tmpgo.get_parent ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	634
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	635 if (tmpgo && tmpgo.get_handle () != 0.0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	636 currentObj = tmpgo;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	637 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	638 currentObj = graphics_object ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	639 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	640
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	641 // Make selected axes current
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	642 bool valid_axes = axesObj.valid_object ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	643 && axesObj.get_properties ().handlevisibility_is ("on")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	644 && axesObj.get_properties ().get_tag () != "legend"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	645 && axesObj.get_properties ().get_tag () != "colorbar";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	646
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	647 if (valid_axes)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	648 Utils::properties<figure> (figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	649 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	650
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	651 Figure fig = dynamic_cast<Figure > (qt_graphics_toolkit::toolkitObject (figObj));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	652
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	653 MouseMode newMouseMode = NoMode;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	654
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	655 if (fig)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	656 newMouseMode = fig->mouseMode ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	657
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	658 switch (newMouseMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	659 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	660 case NoMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	661 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	662 // Update the figure "currentobject"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	663 auto& fprop = Utils::properties<figure> (figObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	664
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	665 if (currentObj
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	666 && currentObj.get_properties ().handlevisibility_is ("on"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	667 fprop.set_currentobject (currentObj.get_handle ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	668 .as_octave_value ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	669 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	670 fprop.set_currentobject (Matrix ());
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	671
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	672 // Update figure "selectiontype" and "currentpoint"
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	673 Q_EMIT gh_set_event (figObj.get_handle (), "selectiontype",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	674 Utils::figureSelectionType (event, isdblclick),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	675 false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	676
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	677 updateCurrentPoint (figObj, obj, event);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	678
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	679 Q_EMIT gh_callback_event (figObj.get_handle (),
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	680 "windowbuttondownfcn",
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	681 button_number (event));
19765 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19762 diff changeset	682
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	683 // Execute the "buttondownfcn" of the selected object. If the
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	684 // latter is empty then execute the figure "buttondownfcn"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	685 if (currentObj && ! currentObj.get ("buttondownfcn").isempty ())
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	686 Q_EMIT gh_callback_event (currentObj.get_handle (),
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	687 "buttondownfcn", button_number (event));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	688 else if (figObj && ! figObj.get ("buttondownfcn").isempty ())
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	689 Q_EMIT gh_callback_event (figObj.get_handle (),
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	690 "buttondownfcn", button_number (event));
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24373 diff changeset	691
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	692 // Show context menu of the selected object
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	693 if (currentObj && event->button () == Qt::RightButton)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	694 ContextMenu::executeAt (m_interpreter,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	695 currentObj.get_properties (),
32388 830f0a2508d5 gui: Replace QMouseEvent::globalPos() by QMouseEvent::globalPosition() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32387 diff changeset	696 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
830f0a2508d5 gui: Replace QMouseEvent::globalPos() by QMouseEvent::globalPosition() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32387 diff changeset	697 event->globalPosition ().toPoint ());
830f0a2508d5 gui: Replace QMouseEvent::globalPos() by QMouseEvent::globalPosition() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32387 diff changeset	698 #else
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	699 event->globalPos ());
32388 830f0a2508d5 gui: Replace QMouseEvent::globalPos() by QMouseEvent::globalPosition() for Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 32387 diff changeset	700 #endif
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	701 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	702 break;
20009 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20006 diff changeset	703
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	704 case TextMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	705 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	706 if (event->modifiers () == Qt::NoModifier)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	707 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	708 switch (event->buttons ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	709 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	710 case Qt::LeftButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	711 m_mouseAnchor = m_mouseCurrent = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	712 m_mouseMode = newMouseMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	713 m_rectMode = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	714 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	715 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	716 redraw (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	717 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	718 break;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	719
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	720 case PanMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	721 case RotateMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	722 case ZoomInMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	723 case ZoomOutMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	724 if (valid_axes)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	725 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	726 bool redraw_figure = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	727
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	728 if (isdblclick)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	729 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	730 if (event->button () == Qt::LeftButton)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	731 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	732 axes::properties& ap = Utils::properties<axes> (axesObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	733
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	734 autoscale_axes (gh_mgr, ap);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	735 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	736 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	737 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	738 redraw_figure = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	739 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	740 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	741 else if (event->modifiers () == Qt::NoModifier)
18692 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	742 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	743 switch (event->buttons ())
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18612 diff changeset	744 {
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	745 case Qt::LeftButton:
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	746 m_mouseAnchor = m_mouseCurrent = event->pos ();
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	747 m_mouseAxes = axesObj.get_handle ();
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	748 m_mouseMode = newMouseMode;
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	749 m_clickMode = newMouseMode == ZoomInMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	750 break;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	751
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	752 case Qt::RightButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	753 if (newMouseMode == ZoomInMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	754 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	755 m_mouseAnchor = m_mouseCurrent = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	756 m_mouseAxes = axesObj.get_handle ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	757 m_mouseMode = newMouseMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	758 m_clickMode = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	759 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	760
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	761 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	762
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	763 case Qt::MiddleButton:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	764 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	765 axes::properties& ap =
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	766 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	767
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	768 autoscale_axes (gh_mgr, ap);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	769 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	770 break;
20090 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20080 diff changeset	771
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	772 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	773 redraw_figure = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	774 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	775 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	776 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	777 else if (event->modifiers () == Qt::ShiftModifier)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	778 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	779 switch (event->buttons ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	780 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	781 case Qt::LeftButton:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	782 if (newMouseMode == ZoomInMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	783 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	784 m_mouseAnchor = m_mouseCurrent = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	785 m_mouseAxes = axesObj.get_handle ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	786 m_mouseMode = newMouseMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	787 m_clickMode = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	788 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	789 break;
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	790
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	791 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	792 redraw_figure = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	793 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	794 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	795 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	796
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	797 if (redraw_figure)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	798 redraw (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	799 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	800 break;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	801
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	802 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	803 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	804 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	805 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	806
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	807 }
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	808
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	809 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	810 Canvas::canvasMouseReleaseEvent (QMouseEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	811 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	812 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	813
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	814 if ((m_mouseMode == ZoomInMode \|\| m_mouseMode == ZoomOutMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	815 && m_mouseAxes.ok ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	816 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	817 octave::autolock guard (gh_mgr.graphics_lock ());
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	818
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	819 graphics_object ax = gh_mgr.get_object (m_mouseAxes);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	820
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	821 if (ax.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	822 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	823 axes::properties& ap = Utils::properties<axes> (ax);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	824
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	825 graphics_object obj = gh_mgr.get_object (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	826
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	827 graphics_object figObj (obj.get_ancestor ("figure"));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	828
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	829 std::string zm = zoom_mode (figObj);
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	830
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	831 QPoint mouse_position = event->pos ();
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	832 if (m_mouseAnchor == mouse_position)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	833 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	834 double factor = (m_clickMode ? 2.0 : 0.5);
19762 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19759 diff changeset	835
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	836 ColumnVector p1 = ap.pixel2coord (mouse_position.x (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	837 mouse_position.y ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	838
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	839 ap.zoom_about_point (zm, p1(0), p1(1), factor);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	840 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	841 else if (m_mouseMode == ZoomInMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	842 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	843 ColumnVector p0 = ap.pixel2coord (m_mouseAnchor.x (),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	844 m_mouseAnchor.y ());
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	845 ColumnVector p1 = ap.pixel2coord (mouse_position.x (),
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	846 mouse_position.y ());
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	847
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	848 Matrix xl (1, 2, 0.0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	849 Matrix yl (1, 2, 0.0);
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	850
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	851 xl(0) = std::min (p0(0), p1(0));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	852 xl(1) = std::max (p0(0), p1(0));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	853 yl(0) = std::min (p0(1), p1(1));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	854 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	855
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	856 ap.zoom (zm, xl, yl);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	857 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	858
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	859 redraw (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	860 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	861 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	862 else if (m_mouseMode == NoMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	863 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	864 octave::autolock guard (gh_mgr.graphics_lock ());
19894 ac18e88ea1bf zoom about point for single clicks John W. Eaton <jwe@octave.org> parents: 19887 diff changeset	865
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	866 graphics_object obj = gh_mgr.get_object (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	867
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	868 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	869 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	870 graphics_object figObj (obj.get_ancestor ("figure"));
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	871
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	872 updateCurrentPoint (figObj, obj, event);
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	873 Q_EMIT gh_callback_event (figObj.get_handle (), "windowbuttonupfcn");
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	874 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	875 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	876 else if (m_mouseMode == TextMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	877 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	878 octave::autolock guard (gh_mgr.graphics_lock ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	879
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	880 graphics_object figObj
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	881 = gh_mgr.get_object (m_handle).get_ancestor ("figure");
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	882
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	883 if (figObj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	884 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	885 QWidget *w = qWidget ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	886 if (w)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	887 {
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	888 QPoint mouse_position = event->pos ();
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	889 Matrix bb = figObj.get ("position").matrix_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	890 bb(0) = m_mouseAnchor.x () / bb(2);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	891 bb(1) = 1.0 - (m_mouseAnchor.y () / bb(3));
32387 90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	892 bb(2) = (mouse_position.x () - m_mouseAnchor.x ()) / bb(2);
90abc5bf1f43 gui: Replace QMouseEvent::x() or y() by QMouseEvent::pos(). Markus Mützel <markus.muetzel@gmx.de> parents: 31808 diff changeset	893 bb(3) = (m_mouseAnchor.y () - mouse_position.y ()) / bb(3);
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	894
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	895 octave_value_list props = ovl ("textbox", bb);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	896
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	897 annotation_dialog anno_dlg (w, props);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	898
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	899 if (anno_dlg.exec () == QDialog::Accepted)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	900 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	901 props = anno_dlg.get_properties ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	902 props.prepend (figObj.get_handle ().as_octave_value ());
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	903
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	904 Q_EMIT interpreter_event
33034 49128bdb9eb2 use explicit lambda-expression captures (bug #65318) John W. Eaton <jwe@octave.org> parents: 33033 diff changeset	905 ([this, props] (octave::interpreter& interp)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	906 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	907 // INTERPRETER THREAD
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	908
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	909 interp.feval ("annotation", props);
20107 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20106 diff changeset	910
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	911 redraw ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	912 });
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	913 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	914 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	915 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	916 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	917 m_rectMode = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	918 m_mouseAxes = graphics_handle ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	919 m_mouseMode = NoMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	920 }
27393 efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	921
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	922 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	923 Canvas::canvasWheelEvent (QWheelEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	924 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	925 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	926
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	927 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	928
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	929 graphics_object obj = gh_mgr.get_object (m_handle);
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27224 diff changeset	930
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	931 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	932 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	933 std::string mode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	934
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	935 graphics_object figObj (obj.get_ancestor ("figure"));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	936
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	937 graphics_object axesObj;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	938
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	939 Matrix children = obj.get_properties ().get_children ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	940 octave_idx_type num_children = children.numel ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	941
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	942 for (int i = 0; i < num_children; i++)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	943 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	944 graphics_object childObj (gh_mgr.get_object (children(i)));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	945
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	946 if (childObj.isa ("axes"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	947 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	948 #if defined (HAVE_QWHEELEVENT_POSITION)
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33034 diff changeset	949 QPoint pos = event->position ().toPoint ();
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	950 #else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	951 QPoint pos = event->pos ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	952 #endif
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	953 graphics_object go = selectFromAxes (childObj, pos);
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	954
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	955 if (go)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	956 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	957 axesObj = childObj;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	958 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	959 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	960 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	961 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	962
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	963 if (axesObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	964 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	965 MouseMode newMouseMode = NoMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	966
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	967 Figure fig = dynamic_cast<Figure > (qt_graphics_toolkit::toolkitObject (figObj));
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	968
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	969 if (fig)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	970 newMouseMode = fig->mouseMode ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	971
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	972 if (axesObj.get_properties ().handlevisibility_is ("on"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	973 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	974 Utils::properties<figure> (figObj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	975 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	976
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	977 if (zoom_enabled (figObj))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	978 {
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33034 diff changeset	979 if (event->angleDelta ().y () > 0)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	980 newMouseMode = ZoomInMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	981 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	982 newMouseMode = ZoomOutMode;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	983
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	984 mode = zoom_mode (figObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	985 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	986 else if (pan_enabled (figObj))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	987 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	988 newMouseMode = PanMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	989
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	990 mode = pan_mode (figObj);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	991 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	992 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	993
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	994 bool redrawFigure = true;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	995
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	996 switch (newMouseMode)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	997 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	998 case ZoomInMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	999 case ZoomOutMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1000 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1001 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	1002
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1003 // Control how fast to zoom when using scroll wheel.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1004 double wheel_zoom_speed = ap.get_mousewheelzoom ();
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1005
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1006 // Determine if we're zooming in or out.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1007 double factor = (newMouseMode == ZoomInMode
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1008 ? 1 / (1.0 - wheel_zoom_speed)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1009 : 1.0 - wheel_zoom_speed);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1010
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1011 // FIXME: should we zoom about point for 2D plots?
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1012
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1013 ap.zoom (mode, factor);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1014 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1015 break;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	1016
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1017 case PanMode:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1018 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1019 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	1020
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33034 diff changeset	1021 double factor = (event->angleDelta ().y () > 0 ? 0.1 : -0.1);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	1022
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1023 if (event->modifiers () == Qt::NoModifier
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1024 && mode != "horizontal")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1025 ap.pan ("vertical", factor);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1026 else if (event->modifiers () == Qt::ShiftModifier
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1027 && mode != "vertical")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1028 ap.pan ("horizontal", factor);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1029 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1030 break;
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1031
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1032 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1033 redrawFigure = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1034 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1035 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1036
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1037 if (redrawFigure)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1038 redraw (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1039 }
27376 1952e110d346 Allow Qt graphics callbacks to work again (bug #56857) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27335 diff changeset	1040
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1041 if (! figObj.get ("windowscrollwheelfcn").isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1042 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1043 octave_scalar_map eventData = Utils::makeScrollEventStruct (event);
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	1044 Q_EMIT gh_callback_event (m_handle, "windowscrollwheelfcn",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1045 eventData);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1046 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1047 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1048 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18692 diff changeset	1049
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1050 bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1051 Canvas::canvasKeyPressEvent (QKeyEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1052 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1053 if (m_eventMask & KeyPress)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1054 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1055 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1056
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1057 octave::autolock guard (gh_mgr.graphics_lock ());
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1058
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1059 graphics_object obj = gh_mgr.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	1060
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1061 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1062 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1063 graphics_object figObj (obj.get_ancestor ("figure"));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1064
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1065 updateCurrentPoint (figObj, obj);
20110 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20107 diff changeset	1066
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1067 octave_scalar_map eventData = Utils::makeKeyEventStruct (event);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1068
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	1069 Q_EMIT gh_set_event (figObj.get_handle (), "currentcharacter",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1070 eventData.getfield ("Character"), false);
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	1071 Q_EMIT gh_callback_event (figObj.get_handle (), "keypressfcn",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1072 eventData);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1073 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1074
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1075 return true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1076 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1077
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1078 return false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1079 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1080
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1081 bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1082 Canvas::canvasKeyReleaseEvent (QKeyEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1083 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1084 if (! event->isAutoRepeat () && (m_eventMask & KeyRelease))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1085 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1086 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1087
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1088 octave::autolock guard (gh_mgr.graphics_lock ());
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1089
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1090 graphics_object obj = gh_mgr.get_object (m_handle);
27224 9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27125 diff changeset	1091
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1092 if (obj.valid_object ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1093 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1094 graphics_object figObj (obj.get_ancestor ("figure"));
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33359 diff changeset	1095 Q_EMIT gh_callback_event (figObj.get_handle (), "keyreleasefcn",
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1096 Utils::makeKeyEventStruct (event));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1097 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1098
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1099 return true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1100 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1101
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1102 return false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1103 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1104
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1105 Canvas *
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1106 Canvas::create (octave::interpreter& interp,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1107 const graphics_handle& handle, QWidget *parent,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1108 const std::string& /* name */)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1109 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1110 // Only OpenGL
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1111 return new GLCanvas (interp, handle, parent);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	1112 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1113
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1114 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/graphics/Canvas.cc @ 33634:4a70f390c85e default tip @