Mercurial > octave
diff libinterp/dldfcn/__init_fltk__.cc @ 19663:dfea01b3425f
more mouse interaction features for Qt plotting widget
* graphics.in.h, graphics.cc (figure::properties::__mouse_mode__,
figure::properties::__pan_mode__, figure::properties::__rotate_mode__,
figure::properties::__zoom_mode__): New properties.
(figure::properties::set___mouse_mode__): New function.
(axes::properties::pan, axes::properties::rotate3d,
axes::properties::zoom): New functions. Handle zoom, and pan modes.
(axes::properties::clear_zoom_stack): New arg, do_unzoom.
Conditionally call unzoom.
(axes::properties::unzoom): Also restore view property.
(axes::properties::rotate_view): Conditionall save state to zoom stack.
(axes::properties::push_zoom_stack): New function.
(axes::properties::pan, axes::properties::rotate3d):
Delete properties.
(axes::properties::update_xlim, axes::properties::update_ylim,
axes::properties::update_zlim): Don't clear zoom stack. Delete
do_clr_zoom argument.
(axes::properties::set_pan, axes::properties::set_rotate3d): Delete.
(F__zoom__): New function.
* Canvas.h, Canvas.cc (Canvas::toggleAxes, Canvas::toggleGrid):
New pure virtual functions.
(Canvas::setCursor, Canvas::canvasToggleAxes,
Canvas::canvasToggleGrid, Canvas::canvasMouseDoubleClickEvent,
Canvas::canvasWheelEvent): New functions.
(zoom_enabled, pan_enabled, pan_mode, rotate_enabled, rotate_mode):
New static functions.
(Canvas::canvasMouseMoveEvent): Call axes::properties::rotate3d to do
rotation. Handle panning.
(Canvas::canvasMousePressEvent): Also handle "unzoom" action when in
pan and rotate modes.
(Canvas::canvasMouseReleaseEvent): Zoom by factor if mouse has not
moved from mouse press event.
* Figure.h, Figure.cc (MouseMode): New enum value, TextMode.
(Figure::m_mouseMode, Figure::m_lastMouseMode): Delete member
variables.
(Figure::mouseMode, Figure::setMouseMode): Get info from and save info
to figure properties.
(Figure::updateFigureToolBarAndMenuBar, Figure::toggleAxes,
Figure::toggleGrid): New functions.
(Figure::m_mouseModeGroup): New member variable.
(Figure::createFigureToolBarAndMenuBar): Add actions for toggling Axes
and Grid. Maintain pointer to MouseModeActionGroup.
(mouse_mode_to_string, mouse_mode_from_string): New functions.
* GLCanvas.h, GLCanvas.cc (GLCanvas::toggleAxes, GLCanvas::ToggleGrid,
GLCanvas::mouseDoubleClickEvent, GLCanvas::wheelEvent): New functions.
* MouseModeActionGroup.h, MouseModeActionGroup.cc
(MouseModeActionGroup::mouseMode): Delete.
(MouseModeActionGroup::setMode): New function.
(MouseModeActionGroup::MouseModeActionGroup): Also include action to
insert text in the list.
* figure.m: Set default pan, rotate, and zoom mode properties for the
figure object.
* pan.m, rotate3d.m, zoom.m: Improve compatibility with Matlab. Set
mode properties for figure.
* __init_fltk__.cc: Cope with changes to graphics properties.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 06 Feb 2015 13:06:54 -0500 |
| parents | 0cdda69dc2b4 |
| children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc Fri Feb 06 08:31:49 2015 -0800 +++ b/libinterp/dldfcn/__init_fltk__.cc Fri Feb 06 13:06:54 2015 -0500 @@ -970,9 +970,9 @@ else if (widg == togglegrid) toggle_grid (); else if (widg == panzoom) - set_on_ax_obj ("pan", "on"); + fp.set___mouse_mode__ ("pan"); else if (widg == rotate) - set_on_ax_obj ("rotate3d", "on"); + fp.set___mouse_mode__ ("rotate"); else if (widg == help) fl_message ("%s", help_text); } @@ -1300,6 +1300,36 @@ fp.set_boundingbox (outerposition2position (bb), true, false); } + bool pan_enabled (void) + { + // Getting pan mode property: + octave_value ov_pm = fp.get___pan_mode__ (); + + octave_scalar_map pm = ov_pm.scalar_map_value (); + + return pm.contents ("Enable").string_value () == "on"; + } + + std::string pan_mode (void) + { + // Getting pan mode property: + octave_value ov_pm = fp.get___pan_mode__ (); + + octave_scalar_map pm = ov_pm.scalar_map_value (); + + return pm.contents ("Motion").string_value (); + } + + bool rotate_enabled (void) + { + // Getting rotate mode property: + octave_value ov_rm = fp.get___rotate_mode__ (); + + octave_scalar_map rm = ov_rm.scalar_map_value (); + + return rm.contents ("Enable").string_value () == "on"; + } + int handle (int event) { if (event == FL_FOCUS) @@ -1363,12 +1393,12 @@ case 'p': case 'P': - set_on_ax_obj ("pan", "on"); + fp.set___mouse_mode__ ("pan"); return 1; case 'r': case 'R': - set_on_ax_obj ("rotate3d", "on"); + fp.set___mouse_mode__ ("rotate"); return 1; } } @@ -1483,7 +1513,7 @@ // Don't pan or rotate legend if (ap.get_tag ().compare ("legend") < 0) { - if (ap.rotate3d_is ("on")) + if (rotate_enabled ()) view2status (ax_obj); else pixel2status (ax_obj, pos_x, pos_y, @@ -1497,13 +1527,9 @@ Fl::event_y () - menu_dy (), x1, y1); - if (ap.pan_is ("on")) - ap.translate_view (x0, x1, y0, y1); - else if (ap.pan_is ("xon")) - ap.translate_view (x0, x1, y1, y1); - else if (ap.pan_is ("yon")) - ap.translate_view (x1, x1, y0, y1); - else if (ap.rotate3d_is ("on")) + if (pan_enabled ()) + ap.translate_view ("both", x0, x1, y0, y1); + else if (rotate_enabled ()) { double daz, del; daz = (Fl::event_x () - pos_x) / pos(2) * 360; @@ -1569,7 +1595,7 @@ pixel2pos (ax, Fl::event_x (), Fl::event_y () - menu_dy (), x1, y1); - ap.zoom_about_point (x1, y1, factor, false); + ap.zoom_about_point ("both", x1, y1, factor, false); mark_modified (); return 1; } @@ -1632,7 +1658,7 @@ yl(0) = y1; yl(1) = y0; } - ap.zoom (xl, yl); + ap.zoom ("both", xl, yl); } mark_modified (); return 1;