Mercurial > octave-nkf

changeset 20279:0bb456e9423b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow interactive annotations in other figures than the currentfigure. * Canvas.cc (Canvas::canvasMouseReleaseEvent): prepend the figure handle argument when calling annotation function.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Tue, 02 Jun 2015 19:24:44 +0200
parents ede7224d062f
children a5f9bf4df254
files libgui/graphics/Canvas.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc	Tue Jun 02 00:03:45 2015 +0200
+++ b/libgui/graphics/Canvas.cc	Tue Jun 02 19:24:44 2015 +0200
@@ -794,13 +794,14 @@
               bb(2) = (event->x () - m_mouseAnchor.x ()) / bb(2);
               bb(3) = (m_mouseAnchor.y () - event->y ()) / bb(3);
 
-              octave_value_list props = ovl("textbox", bb);
+              octave_value_list props = ovl ("textbox", bb);
 
               annotation_dialog anno_dlg (w, props);
 
               if (anno_dlg.exec () == QDialog::Accepted)
                 {
                   props = anno_dlg.get_properties ();
+                  props.prepend (figObj.get_handle ().as_octave_value ());
 
                   octave_link::post_event (this, &Canvas::annotation_callback,
                                            props);