octave: libgui/graphics/Canvas.cc annotate

annotate libgui/graphics/Canvas.cc @ 21196:bd96c2efd4fe

move include statements for OpenGL headers to a single file * oct-opengl.h: New file. * libinterp/corefcn/module.mk: Update. * Canvas.cc, gl-select.cc, gl-select.h, gl-render.cc, gl-render.h, gl2ps-renderer.cc, __init_fltk__.cc, __osmesa_print__.cc: Update include statements.

author	John W. Eaton <jwe@octave.org>
date	Thu, 04 Feb 2016 16:56:02 -0500
parents	69270256b879
children	dd6605e1eaea

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

Mercurial > octave

annotate libgui/graphics/Canvas.cc @ 21196:bd96c2efd4fe