octave-nkf: libgui/graphics/Canvas.cc annotate

annotate libgui/graphics/Canvas.cc @ 20305:062422f2e399

Show axes coordinates in Qt figures (bug #44959) * Canvas.h: new private bool member m_updtaCurrentPoint, to decide wether update the figure "currentpoint" property * Canvas.h (Canvas::enableCurrentPointUpdates): new method to set m_updtaCurrentPoint * Canvas.cc (Canvas::canvasMousePressEvent): move the code for axes/object selection in a dedicated method and call this method (select_object) instead. * Canvas.cc (Canvas::select_object): new method for axes/object selection. * Canvas.cc (Canvas::canvasMouseMoveEvent): update the parent figure status bar with the hovered axes coordinates * Figure.h: declare new method updateStatusBar * Figure.h: declare new private QStatusBar member m_statusBar. Include QStatusBar.h * Figure.cc (Figure::Figure): unconditionally enable mouse traching * Figure.cc (Figure::Figure): add status below of the canvas * Figure.cc (Figure::update): take status bar into account when updating the figure position * Figure.cc (Figure::update): remove some of the leftover debug comments * Figure.cc: define new method updateStatusBar

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Sat, 13 Jun 2015 13:27:01 +0200
parents	a5f9bf4df254
children	64f6d0543626

rev	line source
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	2
20038 f0e61a67ad9f Update copyright year in Qt graphics code. John W. Eaton <jwe@octave.org> parents: 20002 diff changeset	3 Copyright (C) 2011-2015 Michael Goffioul
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	4
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	5 This file is part of Octave.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	6
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	8 under the terms of the GNU General Public License as published by the
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10 option) any later version.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	11
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	15 for more details.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	16
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
18500 49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	18 along with Octave; see the file COPYING. If not, see
49877d3be064 update copyright notices for new QtHandles code John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	19 <http://www.gnu.org/licenses/>.
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	20
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	22
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	23 #ifdef HAVE_CONFIG_H
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	24 #include <config.h>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	26
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <QApplication>
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	28 #include <QBitmap>
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	29 #include <QCursor>
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	30 #include <QInputDialog>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <QList>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <QMouseEvent>
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	33 #include <QWheelEvent>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QRectF>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	35
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "Backend.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "Canvas.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "ContextMenu.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "GLCanvas.h"
18505 fb96b7f55242 rename file to avoid clash on case-insenstive filesystems (bug #41658) John W. Eaton <jwe@octave.org> parents: 18501 diff changeset	40 #include "QtHandlesUtils.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41
20130 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20125 diff changeset	42 #include "annotation-dialog.h"
c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20125 diff changeset	43
19715 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	44 #include "gl2ps-renderer.h"
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	45 #include "octave-qt-link.h"
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	46
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	47 #include "builtin-defun-decls.h"
19715 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	48
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	49 namespace QtHandles
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	50 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	51
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	52 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	53 Canvas::redraw (bool sync)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	54 {
19988 ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	55 QWidget *w = qWidget ();
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	56
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	57 if (w)
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	58 {
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	59 if (sync)
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	60 w->repaint ();
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	61 else
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	62 w->update ();
ed51e17f6ccf avoid possibly dereferencing invalid pointer John W. Eaton <jwe@octave.org> parents: 19931 diff changeset	63 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	64 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	65
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	66 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	67 Canvas::blockRedraw (bool block)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	68 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	69 m_redrawBlocked = block;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	70 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	71
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	72 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	73 Canvas::setCursor (MouseMode mode)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	74 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	75 QWidget *w = qWidget ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	76
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	77 if (w)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	78 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	79 static QCursor origCursor = w->cursor ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	80
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	81 switch (mode)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	82 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	83 case PanMode:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	84 case RotateMode:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	85 w->setCursor (Qt::OpenHandCursor);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	86 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	87
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	88 case ZoomInMode:
19994 210b301a3e39 different cursors for zoom in/out on qthandles canvas Johannes Leuschner <jhnnslschnr@gmail.com> parents: 19989 diff changeset	89 w->setCursor (QPixmap (":/images/zoom-in.png"));
210b301a3e39 different cursors for zoom in/out on qthandles canvas Johannes Leuschner <jhnnslschnr@gmail.com> parents: 19989 diff changeset	90 break;
210b301a3e39 different cursors for zoom in/out on qthandles canvas Johannes Leuschner <jhnnslschnr@gmail.com> parents: 19989 diff changeset	91
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	92 case ZoomOutMode:
19994 210b301a3e39 different cursors for zoom in/out on qthandles canvas Johannes Leuschner <jhnnslschnr@gmail.com> parents: 19989 diff changeset	93 w->setCursor (QPixmap (":/images/zoom-out.png"));
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	94 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	95
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	96 default:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	97 w->setCursor (origCursor);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	98 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	99 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	100 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	101 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	102
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	103 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	104 Canvas::print (const QString& file_cmd, const QString& term)
19715 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	105 {
19989 b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19988 diff changeset	106 gh_manager::auto_lock lock;
19715 35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	107 graphics_object obj = gh_manager::get_object (m_handle);
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	108
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	109 if (obj.valid_object ())
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	110 {
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	111 graphics_object figObj (obj.get_ancestor ("figure"));
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	112
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	113 gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ());
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	114 }
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	115 }
35bca657d74d printing for Qt plot widget (bug #42537) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	116
20145 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	117 /*
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	118 Two updateCurrentPoint() routines are required:
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	119 1) Used for QMouseEvents where cursor position data is in callback from Qt.
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	120 2) Used for QKeyEvents where cursor position must be determined.
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	121 */
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	122 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	123 Canvas::updateCurrentPoint(const graphics_object& fig,
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	124 const graphics_object& obj, QMouseEvent* event)
18646 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	125 {
19989 b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19988 diff changeset	126 gh_manager::auto_lock lock;
b6061813a693 always obtain gh_manager lock before accessing graphics objects John W. Eaton <jwe@octave.org> parents: 19988 diff changeset	127
18646 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	128 gh_manager::post_set (fig.get_handle (), "currentpoint",
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	129 Utils::figureCurrentPoint (fig, event), false);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	130
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	131 Matrix children = obj.get_properties ().get_children ();
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	132 octave_idx_type num_children = children.numel ();
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	133
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	134 for (int i = 0; i < num_children; i++)
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	135 {
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	136 graphics_object childObj (gh_manager::get_object (children(i)));
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	137
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	138 if (childObj.isa ("axes"))
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	139 {
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	140 axes::properties& ap = Utils::properties<axes> (childObj);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	141 Matrix x_zlim = ap.get_transform_zlim ();
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	142 graphics_xform x_form = ap.get_transform ();
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	143
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	144 ColumnVector p1 = x_form.untransform (event->x (), event->y (),
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	145 x_zlim(0));
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	146 ColumnVector p2 = x_form.untransform (event->x (), event->y (),
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	147 x_zlim(1));
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	148
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	149 Matrix cp (2, 3, 0.0);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	150
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	151 cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	152 cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	153
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	154 gh_manager::post_set (childObj.get_handle (), "currentpoint", cp,
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	155 false);
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	156 }
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	157 }
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	158 }
9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	159
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	160 void
20145 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	161 Canvas::updateCurrentPoint(const graphics_object& fig,
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	162 const graphics_object& obj)
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	163 {
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	164 gh_manager::auto_lock lock;
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	165
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	166 gh_manager::post_set (fig.get_handle (), "currentpoint",
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	167 Utils::figureCurrentPoint (fig), false);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	168
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	169 Matrix children = obj.get_properties ().get_children ();
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	170 octave_idx_type num_children = children.numel ();
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	171
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	172 for (int i = 0; i < num_children; i++)
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	173 {
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	174 graphics_object childObj (gh_manager::get_object (children(i)));
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	175
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	176 if (childObj.isa ("axes"))
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	177 {
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	178 // FIXME: QCursor::pos() may give inaccurate results with asynchronous
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	179 // window systems like X11 over ssh.
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	180 QWidget *w = qWidget ();
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	181 QPoint p = w->mapFromGlobal (QCursor::pos ());
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	182 axes::properties& ap = Utils::properties<axes> (childObj);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	183 Matrix x_zlim = ap.get_transform_zlim ();
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	184 graphics_xform x_form = ap.get_transform ();
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	185
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	186 ColumnVector p1 = x_form.untransform (p.x (), p.y (), x_zlim(0));
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	187 ColumnVector p2 = x_form.untransform (p.x (), p.y (), x_zlim(1));
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	188
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	189 Matrix cp (2, 3, 0.0);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	190
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	191 cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	192 cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	193
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	194 gh_manager::post_set (childObj.get_handle (), "currentpoint", cp,
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	195 false);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	196 }
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	197 }
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	198 }
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	199
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	200 void
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	201 Canvas::annotation_callback (const octave_value_list& args)
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	202 {
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	203 Ffeval (ovl ("annotation").append (args));
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	204
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	205 redraw ();
908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	206 }
20216 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20145 diff changeset	207
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	208 void
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	209 Canvas::canvasToggleAxes (const graphics_handle& handle)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	210 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	211 gh_manager::auto_lock lock;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	212
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	213 graphics_object go = gh_manager::get_object (handle);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	214
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	215 if (go.valid_object ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	216 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	217 figure::properties& fp = Utils::properties<figure> (go);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	218
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	219 graphics_handle ah = fp.get_currentaxes ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	220
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	221 graphics_object ax = gh_manager::get_object (ah);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	222
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	223 if (ax.valid_object ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	224 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	225 axes::properties& ap = Utils::properties<axes> (ax);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	226
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	227 if (ap.handlevisibility_is ("on"))
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	228 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	229 ap.set_visible (! ap.is_visible ());
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	230
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	231 redraw (true);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	232 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	233 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	234 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	235 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	236
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	237 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	238 Canvas::canvasToggleGrid (const graphics_handle& handle)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	239 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	240 gh_manager::auto_lock lock;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	241
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	242 graphics_object go = gh_manager::get_object (handle);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	243
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	244 if (go.valid_object ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	245 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	246 figure::properties& fp = Utils::properties<figure> (go);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	247
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	248 graphics_handle ah = fp.get_currentaxes ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	249
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	250 graphics_object ax = gh_manager::get_object (ah);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	251
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	252 if (ax.valid_object ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	253 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	254 axes::properties& ap = Utils::properties<axes> (ax);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	255
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	256 std::string tmp;
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	257
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	258 // If any grid is off, then turn them all on. If they are all
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	259 // on, then turn them off.
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	260
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	261 std::string state = ((ap.get_xgrid () == "off"
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	262 \|\| ap.get_ygrid () == "off"
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	263 \|\| ap.get_zgrid () == "off")
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	264 ? "on" : "off");
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	265
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	266 ap.set_xgrid (state);
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	267 ap.set_ygrid (state);
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	268 ap.set_zgrid (state);
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	269
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	270 redraw (true);
9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	271
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	272 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	273 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	274 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	275
19905 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	276 static void
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	277 autoscale_axes (axes::properties& ap)
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	278 {
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	279 ap.clear_zoom_stack ();
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	280
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	281 ap.set_xlimmode ("auto");
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	282 ap.set_ylimmode ("auto");
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	283 ap.set_zlimmode ("auto");
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	284 }
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	285
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	286 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	287 Canvas::canvasAutoAxes (const graphics_handle& handle)
19905 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	288 {
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	289 gh_manager::auto_lock lock;
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	290
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	291 graphics_object go = gh_manager::get_object (handle);
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	292
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	293 if (go.valid_object ())
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	294 {
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	295 figure::properties& fp = Utils::properties<figure> (go);
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	296
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	297 graphics_handle ah = fp.get_currentaxes ();
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	298
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	299 graphics_object ax = gh_manager::get_object (ah);
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	300
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	301 if (ax.valid_object ())
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	302 {
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	303 axes::properties& ap = Utils::properties<axes> (ax);
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	304
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	305 autoscale_axes (ap);
19905 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	306
20251 9866b3202c52 Let grid and autoscale buttons work when the axes is invisible (bug #44436) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20216 diff changeset	307 redraw (true);
19905 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	308 }
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	309 }
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	310 }
815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	311
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	312 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	313 Canvas::canvasPaintEvent (void)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	314 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	315 if (! m_redrawBlocked)
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	316 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	317 gh_manager::auto_lock lock;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	318
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	319 draw (m_handle);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	320
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	321 if ((m_mouseMode == ZoomInMode && m_mouseAxes.ok ()) \|\| m_rectMode)
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	322 drawZoomBox (m_mouseAnchor, m_mouseCurrent);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	323 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	324 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	325
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	326 static bool
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	327 pan_enabled (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	328 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	329 // Getting pan mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	330 octave_value ov_pm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	331 = Utils::properties<figure> (figObj).get___pan_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	332
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	333 octave_scalar_map pm = ov_pm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	334
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	335 return pm.contents ("Enable").string_value () == "on";
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	336 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	337
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	338 static std::string
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	339 pan_mode (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	340 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	341 // Getting pan mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	342 octave_value ov_pm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	343 = Utils::properties<figure> (figObj).get___pan_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	344
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	345 octave_scalar_map pm = ov_pm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	346
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	347 return pm.contents ("Motion").string_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	348 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	349
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	350 static bool
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	351 rotate_enabled (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	352 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	353 // Getting rotate mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	354 octave_value ov_rm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	355 = Utils::properties<figure> (figObj).get___rotate_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	356
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	357 octave_scalar_map rm = ov_rm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	358
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	359 return rm.contents ("Enable").string_value () == "on";
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	360 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	361
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	362 static bool
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	363 zoom_enabled (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	364 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	365 // Getting zoom mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	366 octave_value ov_zm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	367 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	368
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	369 octave_scalar_map zm = ov_zm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	370
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	371 return zm.contents ("Enable").string_value () == "on";
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	372 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	373
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	374 static std::string
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	375 zoom_mode (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	376 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	377 // Getting zoom mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	378 octave_value ov_zm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	379 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	380
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	381 octave_scalar_map zm = ov_zm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	382
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	383 return zm.contents ("Motion").string_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	384 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	385
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	386 static std::string
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	387 zoom_direction (const graphics_object figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	388 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	389 // Getting zoom mode property:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	390 octave_value ov_zm
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	391 = Utils::properties<figure> (figObj).get___zoom_mode__ ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	392
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	393 octave_scalar_map zm = ov_zm.scalar_map_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	394
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	395 return zm.contents ("Direction").string_value ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	396 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	397
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	398 void
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	399 Canvas::select_object (graphics_object obj, QMouseEvent* event,
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	400 graphics_object &currentObj, graphics_object &axesObj)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	401 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	402 QList<graphics_object> axesList;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	403 Matrix children = obj.get_properties ().get_all_children ();
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	404 octave_idx_type num_children = children.numel ();
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	405
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	406 for (int i = 0; i < num_children; i++)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	407 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	408 graphics_object childObj (gh_manager::get_object (children(i)));
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	409
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	410 if (childObj.isa ("axes"))
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	411 axesList.append (childObj);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	412 else if (childObj.isa ("uicontrol") \|\| childObj.isa ("uipanel"))
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	413 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	414 Matrix bb = childObj.get_properties ().get_boundingbox (false);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	415 QRectF r (bb(0), bb(1), bb(2), bb(3));
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	416
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	417 r.adjust (-5, -5, 5, 5);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	418 if (r.contains (event->posF ()))
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	419 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	420 currentObj = childObj;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	421 break;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	422 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	423 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	424 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	425
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	426 if (! currentObj)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	427 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	428 for (QList<graphics_object>::ConstIterator it = axesList.begin ();
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	429 it != axesList.end (); ++it)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	430 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	431 graphics_object go = selectFromAxes (*it, event->pos ());
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	432
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	433 if (go)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	434 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	435 currentObj = go;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	436 axesObj = *it;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	437 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	438 // FIXME: is this really necessary? the axes object should
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	439 // have been selected through selectFromAxes anyway
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	440 else if (it->get_properties ().is_hittest ())
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	441 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	442 Matrix bb = it->get_properties ().get_boundingbox (true);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	443 QRectF r (bb(0), bb(1), bb(2), bb(3));
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	444
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	445 if (r.contains (event->posF ()))
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	446 axesObj = *it;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	447 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	448
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	449 if (axesObj && currentObj)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	450 break;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	451 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	452 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	453 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	454
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	455 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	456 Canvas::canvasMouseMoveEvent (QMouseEvent* event)
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	457 {
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	458 gh_manager::auto_lock lock;
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	459 graphics_object ax = gh_manager::get_object (m_mouseAxes);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	460
20280 a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20279 diff changeset	461 if (m_mouseMode != NoMode && (ax.valid_object () \|\| m_mouseMode == TextMode))
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	462 {
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	463 switch (m_mouseMode)
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	464 {
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	465 case RotateMode:
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	466 {
20280 a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20279 diff changeset	467 axes::properties& ap = Utils::properties<axes> (ax);
a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20279 diff changeset	468
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	469 ap.rotate3d (m_mouseCurrent.x (), event->x (),
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	470 m_mouseCurrent.y (), event->y ());
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	471
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	472 // Update current mouse position
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	473 m_mouseCurrent = event->pos ();
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	474
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	475 // Force immediate redraw
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	476 redraw (true);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	477 }
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	478 break;
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	479 case TextMode:
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	480 case ZoomInMode:
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	481 case ZoomOutMode:
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	482 m_mouseCurrent = event->pos ();
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	483 redraw (true);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	484 break;
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	485
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	486 case PanMode:
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	487 {
20280 a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20279 diff changeset	488 axes::properties& ap = Utils::properties<axes> (ax);
a5f9bf4df254 Avoid crash when trying to annotate an empty figure (bug #45241) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20279 diff changeset	489
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	490 graphics_object figObj (ax.get_ancestor ("figure"));
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	491
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	492 std::string mode = pan_mode (figObj);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	493
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	494 ColumnVector p0 = ap.pixel2coord (m_mouseCurrent.x (),
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	495 m_mouseCurrent.y ());
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	496 ColumnVector p1 = ap.pixel2coord (event->x (),
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	497 event->y ());
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	498
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	499 ap.translate_view (mode, p0(0), p1(0), p0(1), p1(1));
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	500
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	501 // Update current mouse position
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	502 m_mouseCurrent = event->pos ();
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	503
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	504 // Force immediate redraw
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	505 redraw (true);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	506 }
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	507
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	508 default:
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	509 break;
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	510 }
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	511 }
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	512 else if (m_mouseMode == NoMode && m_updateCurrentPoint)
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	513 {
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	514 graphics_object obj = gh_manager::get_object (m_handle);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	515
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	516 if (obj.valid_object ())
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	517 {
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	518 graphics_object figObj (obj.get_ancestor ("figure"));
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	519
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	520 updateCurrentPoint (figObj, obj, event);
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	521 gh_manager::post_callback (figObj.get_handle (),
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	522 "windowbuttonmotionfcn");
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	523 }
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	524 }
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	525
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	526 // Update mouse coordinates in the figure window status bar
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	527 graphics_object obj = gh_manager::get_object (m_handle);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	528
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	529 if (obj.valid_object ())
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	530 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	531 graphics_object currentObj, axesObj;
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	532 select_object (obj, event, currentObj, axesObj);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	533
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	534 if (axesObj.valid_object ())
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	535 {
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	536 Figure* fig =
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	537 dynamic_cast<Figure*> (Backend::toolkitObject (obj));
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	538 axes::properties& ap = Utils::properties<axes> (axesObj);
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	539 fig->updateStatusBar (ap.pixel2coord (event->x (), event->y ()));
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	540 }
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	541 }
19922 966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	542 }
966a1933f3fa respect x- or y-only pan mode when clicking and dragging (bug #44408) John W. Eaton <jwe@octave.org> parents: 19905 diff changeset	543
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	544 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	545 Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	546 {
20075 055ad6fbc910 Don't zoom in for 'Z-' setting and rectangle drag (bug #44437). Rik <rik@octave.org> parents: 20044 diff changeset	547 // same processing as normal click, but event type is MouseButtonDblClick
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	548 canvasMousePressEvent (event);
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	549 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	550
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	551 static double
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	552 button_number (QMouseEvent *event)
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	553 {
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	554 double retval = 0;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	555
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	556 switch (event->button ())
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	557 {
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	558 case Qt::LeftButton:
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	559 retval = 1;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	560 break;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	561
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	562 case Qt::MidButton:
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	563 retval = 2;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	564 break;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	565
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	566 case Qt::RightButton:
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	567 retval = 3;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	568 break;
19816 98cc7c741c5a avoid GCC warning about enumeration values not handled in switch statement John W. Eaton <jwe@octave.org> parents: 19799 diff changeset	569
98cc7c741c5a avoid GCC warning about enumeration values not handled in switch statement John W. Eaton <jwe@octave.org> parents: 19799 diff changeset	570 default:
98cc7c741c5a avoid GCC warning about enumeration values not handled in switch statement John W. Eaton <jwe@octave.org> parents: 19799 diff changeset	571 break;
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	572 }
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	573
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	574 return retval;
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	575 }
134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	576
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	577 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	578 Canvas::canvasMousePressEvent (QMouseEvent* event)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	579 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	580 gh_manager::auto_lock lock;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	581 graphics_object obj = gh_manager::get_object (m_handle);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	582
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	583 bool isdblclick = (event->type () == QEvent::MouseButtonDblClick);
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	584
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	585 if (obj.valid_object ())
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	586 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	587 graphics_object figObj (obj.get_ancestor ("figure"));
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	588 graphics_object currentObj, axesObj;
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	589
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	590 select_object (obj, event, currentObj, axesObj);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	591
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	592 if (axesObj)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	593 {
20305 062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	594 if (axesObj.get_properties ().handlevisibility_is ("on"))
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	595 Utils::properties<figure> (figObj)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	596 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	597 if (! currentObj)
062422f2e399 Show axes coordinates in Qt figures (bug #44959) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20280 diff changeset	598 currentObj = axesObj;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	599 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	600
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	601 if (! currentObj)
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	602 currentObj = obj;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	603
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	604 if (currentObj.get_properties ().handlevisibility_is ("on"))
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	605 Utils::properties<figure> (figObj)
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	606 .set_currentobject (currentObj.get_handle ().as_octave_value ());
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	607 else
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	608 Utils::properties<figure> (figObj).set_currentobject (octave_NaN);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	609
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	610 Figure* fig = dynamic_cast<Figure*> (Backend::toolkitObject (figObj));
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	611
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	612 MouseMode newMouseMode = NoMode;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	613
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	614 if (fig)
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	615 newMouseMode = fig->mouseMode ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	616
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	617 switch (newMouseMode)
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	618 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	619 case NoMode:
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	620 gh_manager::post_set (figObj.get_handle (), "selectiontype",
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	621 Utils::figureSelectionType (event, isdblclick), false);
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	622
18646 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	623 updateCurrentPoint (figObj, obj, event);
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	624
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	625 gh_manager::post_callback (figObj.get_handle (),
20034 0376c1225660 Fix ginput to return button number with Qt toolkit (bug #44676). Rik <rik@octave.org> parents: 20002 diff changeset	626 "windowbuttondownfcn",
0376c1225660 Fix ginput to return button number with Qt toolkit (bug #44676). Rik <rik@octave.org> parents: 20002 diff changeset	627 button_number (event));
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	628
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	629 gh_manager::post_callback (currentObj.get_handle (),
20034 0376c1225660 Fix ginput to return button number with Qt toolkit (bug #44676). Rik <rik@octave.org> parents: 20002 diff changeset	630 "buttondownfcn",
0376c1225660 Fix ginput to return button number with Qt toolkit (bug #44676). Rik <rik@octave.org> parents: 20002 diff changeset	631 button_number (event));
19799 134e5bfff5c5 * Canvas.cc (button_number): New static function. John W. Eaton <jwe@octave.org> parents: 19796 diff changeset	632
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	633 if (event->button () == Qt::RightButton)
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	634 ContextMenu::executeAt (currentObj.get_properties (),
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	635 event->globalPos ());
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	636 break;
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	637
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	638 case TextMode:
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	639 {
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	640 if (event->modifiers () == Qt::NoModifier)
20130 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20125 diff changeset	641 {
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	642 switch (event->buttons ())
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	643 {
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	644 case Qt::LeftButton:
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	645 m_mouseAnchor = m_mouseCurrent = event->pos ();
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	646 m_mouseMode = newMouseMode;
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	647 m_rectMode = true;
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	648 }
20130 c164cfc24bdd QtHandles: add annotations dialog John Donoghue <john.donoghue@ieee.org> parents: 20125 diff changeset	649 }
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	650 redraw (false);
20115 908b68a98ba6 initial implementation of text annotations with Qt plotting John W. Eaton <jwe@octave.org> parents: 20075 diff changeset	651 }
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	652 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	653
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	654 case PanMode:
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	655 case RotateMode:
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	656 case ZoomInMode:
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	657 case ZoomOutMode:
20141 8eb72c4ed457 Add uicontextmenu to annotation objects Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20130 diff changeset	658 if (axesObj && axesObj.get_properties ().handlevisibility_is ("on"))
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	659 {
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	660 bool redraw_figure = true;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	661
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	662 if (isdblclick)
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	663 {
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	664 if (event->button () == Qt::LeftButton)
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	665 {
20075 055ad6fbc910 Don't zoom in for 'Z-' setting and rectangle drag (bug #44437). Rik <rik@octave.org> parents: 20044 diff changeset	666 axes::properties& ap = Utils::properties<axes> (axesObj);
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	667
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	668 autoscale_axes (ap);
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	669 }
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	670 else
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	671 {
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	672 redraw_figure = false;
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	673 }
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	674 }
f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	675 else if (event->modifiers () == Qt::NoModifier)
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	676 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	677 switch (event->buttons ())
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	678 {
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	679 case Qt::LeftButton:
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	680 m_mouseAnchor = m_mouseCurrent = event->pos ();
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	681 m_mouseAxes = axesObj.get_handle ();
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	682 m_mouseMode = newMouseMode;
20125 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	683 m_clickMode = newMouseMode == ZoomInMode;
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	684 break;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	685
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	686 case Qt::RightButton:
20125 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	687 if (newMouseMode == ZoomInMode)
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	688 {
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	689 m_mouseAnchor = m_mouseCurrent = event->pos ();
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	690 m_mouseAxes = axesObj.get_handle ();
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	691 m_mouseMode = newMouseMode;
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	692 m_clickMode = false;
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	693 }
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	694
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	695 break;
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	696
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	697 case Qt::MidButton:
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	698 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	699 axes::properties& ap =
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	700 Utils::properties<axes> (axesObj);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	701
19905 815db217f6f4 provide autoscale option for Qt plotting (bug #44307) John W. Eaton <jwe@octave.org> parents: 19901 diff changeset	702 autoscale_axes (ap);
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	703 }
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	704 break;
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	705
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	706 default:
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	707 redraw_figure = false;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	708 break;
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	709 }
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	710 }
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	711 else if (event->modifiers () == Qt::ShiftModifier)
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	712 {
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	713 switch (event->buttons ())
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	714 {
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	715 case Qt::LeftButton:
20125 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	716 if (newMouseMode == ZoomInMode)
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	717 {
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	718 m_mouseAnchor = m_mouseCurrent = event->pos ();
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	719 m_mouseAxes = axesObj.get_handle ();
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	720 m_mouseMode = newMouseMode;
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	721 m_clickMode = false;
c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	722 }
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	723 break;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	724
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	725 default:
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	726 redraw_figure = false;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	727 break;
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	728 }
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	729 }
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	730
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	731 if (redraw_figure)
eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	732 redraw (false);
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	733 }
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	734 break;
19796 eebe8da58f8d allow shift + left button to zoom out (bug #44304) John W. Eaton <jwe@octave.org> parents: 19793 diff changeset	735
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	736 default:
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	737 break;
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	738 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	739 }
20044 f2dea119369e Qt Canvas: set selection type to 'open' on double click (Bug #44669) John Donoghue parents: 20041 diff changeset	740
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	741 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	742
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	743 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	744 Canvas::canvasMouseReleaseEvent (QMouseEvent* event)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	745 {
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	746 if ((m_mouseMode == ZoomInMode \|\| m_mouseMode == ZoomOutMode)
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	747 && m_mouseAxes.ok ())
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	748 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	749 gh_manager::auto_lock lock;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	750 graphics_object ax = gh_manager::get_object (m_mouseAxes);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	751
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	752 if (ax.valid_object ())
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	753 {
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	754 axes::properties& ap = Utils::properties<axes> (ax);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	755
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	756 graphics_object obj = gh_manager::get_object (m_handle);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	757
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	758 graphics_object figObj (obj.get_ancestor ("figure"));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	759
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	760 std::string zm = zoom_mode (figObj);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	761
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	762 if (m_mouseAnchor == event->pos ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	763 {
20125 c6c5cb9c4743 Right-click should zoom out by 2 for Qt toolkit (bug #44304). Rik <rik@octave.org> parents: 20115 diff changeset	764 double factor = m_clickMode ? 2.0 : 0.5;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	765
19929 ac18e88ea1bf zoom about point for single clicks John W. Eaton <jwe@octave.org> parents: 19922 diff changeset	766 ColumnVector p1 = ap.pixel2coord (event->x (), event->y ());
ac18e88ea1bf zoom about point for single clicks John W. Eaton <jwe@octave.org> parents: 19922 diff changeset	767
ac18e88ea1bf zoom about point for single clicks John W. Eaton <jwe@octave.org> parents: 19922 diff changeset	768 ap.zoom_about_point (zm, p1(0), p1(1), factor);
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	769 }
20075 055ad6fbc910 Don't zoom in for 'Z-' setting and rectangle drag (bug #44437). Rik <rik@octave.org> parents: 20044 diff changeset	770 else if (m_mouseMode == ZoomInMode)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	771 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	772 ColumnVector p0 = ap.pixel2coord (m_mouseAnchor.x (),
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	773 m_mouseAnchor.y ());
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	774 ColumnVector p1 = ap.pixel2coord (event->x (),
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	775 event->y ());
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	776
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	777 Matrix xl (1, 2, 0.0);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	778 Matrix yl (1, 2, 0.0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	779
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	780 xl(0) = std::min (p0(0), p1(0));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	781 xl(1) = std::max (p0(0), p1(0));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	782 yl(0) = std::min (p0(1), p1(1));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	783 yl(1) = std::max (p0(1), p1(1));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	784
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	785 ap.zoom (zm, xl, yl);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	786 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	787
18726 fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	788 redraw (false);
fe0e34be5576 maint: untabify recently added code files. Rik <rik@octave.org> parents: 18646 diff changeset	789 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	790 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	791 else if (m_mouseMode == NoMode)
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	792 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	793 gh_manager::auto_lock lock;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	794 graphics_object obj = gh_manager::get_object (m_handle);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	795
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	796 if (obj.valid_object ())
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	797 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	798 graphics_object figObj (obj.get_ancestor ("figure"));
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	799
18646 9597e00ed2dd Add support for "windowbuttonmotionfcn" and "currentpoint" Michael Goffioul <michael.goffioul@gmail.com> parents: 18505 diff changeset	800 updateCurrentPoint (figObj, obj, event);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	801 gh_manager::post_callback (figObj.get_handle (),
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	802 "windowbuttonupfcn");
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	803 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	804 }
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	805 else if (m_mouseMode == TextMode)
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	806 {
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	807 gh_manager::auto_lock lock;
20216 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20145 diff changeset	808
aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20145 diff changeset	809 graphics_object figObj =
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	810 gh_manager::get_object (m_handle).get_ancestor ("figure");
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	811 if (figObj.valid_object ())
20216 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20145 diff changeset	812 {
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	813 QWidget *w = qWidget ();
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	814 if (w)
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	815 {
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	816 Matrix bb = figObj.get ("position").matrix_value ();
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	817 bb(0) = m_mouseAnchor.x () / bb(2);
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	818 bb(1) = 1.0 - (m_mouseAnchor.y () / bb(3));
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	819 bb(2) = (event->x () - m_mouseAnchor.x ()) / bb(2);
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	820 bb(3) = (m_mouseAnchor.y () - event->y ()) / bb(3);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	821
20279 0bb456e9423b Allow interactive annotations in other figures than the currentfigure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20251 diff changeset	822 octave_value_list props = ovl ("textbox", bb);
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	823
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	824 annotation_dialog anno_dlg (w, props);
20216 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20145 diff changeset	825
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	826 if (anno_dlg.exec () == QDialog::Accepted)
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	827 {
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	828 props = anno_dlg.get_properties ();
20279 0bb456e9423b Allow interactive annotations in other figures than the currentfigure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20251 diff changeset	829 props.prepend (figObj.get_handle ().as_octave_value ());
20142 f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	830
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	831 octave_link::post_event (this, &Canvas::annotation_callback,
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	832 props);
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	833 }
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	834 }
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	835 }
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	836 }
f1f6d5eab46f Draw a zoom-like box when creating an annotation interactively Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20141 diff changeset	837 m_rectMode = false;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	838 m_mouseAxes = graphics_handle ();
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	839 m_mouseMode = NoMode;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	840 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	841
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	842 void
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	843 Canvas::canvasWheelEvent (QWheelEvent* event)
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	844 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	845 gh_manager::auto_lock lock;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	846 graphics_object obj = gh_manager::get_object (m_handle);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	847
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	848 if (obj.valid_object ())
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	849 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	850 std::string mode;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	851
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	852 graphics_object axesObj;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	853
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	854 Matrix children = obj.get_properties ().get_children ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	855 octave_idx_type num_children = children.numel ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	856
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	857 for (int i = 0; i < num_children; i++)
19931 0e0a3bbe142f Canvas.cc: Replace tabs with spaces. Rik <rik@octave.org> parents: 19929 diff changeset	858 {
0e0a3bbe142f Canvas.cc: Replace tabs with spaces. Rik <rik@octave.org> parents: 19929 diff changeset	859 graphics_object childObj (gh_manager::get_object (children(i)));
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	860
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	861 if (childObj.isa ("axes"))
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	862 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	863 graphics_object go = selectFromAxes (childObj, event->pos ());
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	864
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	865 if (go)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	866 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	867 axesObj = childObj;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	868 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	869 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	870 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	871 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	872
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	873 if (axesObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	874 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	875 MouseMode newMouseMode = NoMode;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	876
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	877 graphics_object figObj (obj.get_ancestor ("figure"));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	878
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	879 Figure* fig = dynamic_cast<Figure*> (Backend::toolkitObject (figObj));
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	880
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	881 if (fig)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	882 newMouseMode = fig->mouseMode ();
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	883
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	884 if (axesObj.get_properties ().handlevisibility_is ("on"))
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	885 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	886 Utils::properties<figure> (figObj)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	887 .set_currentaxes (axesObj.get_handle ().as_octave_value ());
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	888
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	889 if (zoom_enabled (figObj))
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	890 {
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	891 if (event->delta () > 0)
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	892 newMouseMode = ZoomInMode;
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	893 else
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	894 newMouseMode = ZoomOutMode;
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	895
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	896 mode = zoom_mode (figObj);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	897 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	898 else if (pan_enabled (figObj))
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	899 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	900 newMouseMode = PanMode;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	901
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	902 mode = pan_mode (figObj);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	903 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	904 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	905
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	906 bool redrawFigure = true;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	907
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	908 switch (newMouseMode)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	909 {
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	910 case ZoomInMode:
6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	911 case ZoomOutMode:
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	912 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	913 axes::properties& ap = Utils::properties<axes> (axesObj);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	914
19793 ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	915 // Control how fast to zoom when using scroll wheel.
ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	916 double wheel_zoom_speed = ap.get_mousewheelzoom ();
ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	917
ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	918 // Determine if we're zooming in or out.
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	919 double factor = (newMouseMode == ZoomInMode
19793 ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	920 ? 1 / (1.0 - wheel_zoom_speed)
ed1bafbb87ee allow mouse wheel zoom amount to be configurable for qt graphics (bug #44304) John W. Eaton <jwe@octave.org> parents: 19715 diff changeset	921 : 1.0 - wheel_zoom_speed);
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	922
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	923 // FIXME: should we zoom about point for 2D plots?
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	924
19901 6ba3d0f7c6e8 improve mouse zooming for Qt plotting (bug #44302) John W. Eaton <jwe@octave.org> parents: 19816 diff changeset	925 ap.zoom (mode, factor);
19697 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	926 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	927 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	928
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	929 case PanMode:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	930 {
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	931 axes::properties& ap = Utils::properties<axes> (axesObj);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	932
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	933 double factor = event->delta () > 0 ? 0.1 : -0.1;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	934
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	935 ap.pan (mode, factor);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	936 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	937 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	938
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	939 default:
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	940 redrawFigure = false;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	941 break;
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	942 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	943
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	944 if (redrawFigure)
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	945 redraw (false);
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	946 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	947 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	948 }
dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 18726 diff changeset	949
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	950 bool
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	951 Canvas::canvasKeyPressEvent (QKeyEvent* event)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	952 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	953 if (m_eventMask & KeyPress)
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	954 {
20145 248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	955 gh_manager::auto_lock lock;
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	956 graphics_object obj = gh_manager::get_object (m_handle);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	957
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	958 if (obj.valid_object ())
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	959 {
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	960 graphics_object figObj (obj.get_ancestor ("figure"));
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	961
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	962 updateCurrentPoint (figObj, obj);
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	963 }
248f2f2e7d48 Return correct x,y coordinates for keystroke with ginput in Qt (bug #44834). Rik <rik@octave.org> parents: 20142 diff changeset	964
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	965 octave_scalar_map eventData = Utils::makeKeyEventStruct (event);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	966
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	967 gh_manager::post_set (m_handle, "currentcharacter",
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	968 eventData.getfield ("Character"), false);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	969 gh_manager::post_callback (m_handle, "keypressfcn", eventData);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	970
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	971 return true;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	972 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	973
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	974 return false;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	975 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	976
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	977 bool
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	978 Canvas::canvasKeyReleaseEvent (QKeyEvent* event)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	979 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	980 if (! event->isAutoRepeat () && (m_eventMask & KeyRelease))
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	981 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	982 gh_manager::post_callback (m_handle, "keyreleasefcn",
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	983 Utils::makeKeyEventStruct (event));
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	984
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	985 return true;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	986 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	987
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	988 return false;
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	989 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	990
20002 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	991 Canvas*
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	992 Canvas::create (const std::string& /* name /, QWidget parent,
3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19994 diff changeset	993 const graphics_handle& handle)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	994 {
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	995 // Only OpenGL
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	996 return new GLCanvas (parent, handle);
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	997 }
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	998
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	999 }; // namespace QtHandles

Mercurial > octave-nkf

annotate libgui/graphics/Canvas.cc @ 20305:062422f2e399