Mercurial > octave
diff libgui/graphics/Figure.h @ 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 | fe0e34be5576 |
children | 35bca657d74d |
line wrap: on
line diff
--- a/libgui/graphics/Figure.h Fri Feb 06 08:31:49 2015 -0800 +++ b/libgui/graphics/Figure.h Fri Feb 06 13:06:54 2015 -0500 @@ -37,11 +37,15 @@ enum MouseMode { + // NOTE: These values must match the order of the buttons in the + // MouseModeActionGroup object. + NoMode = 0, RotateMode = 1, ZoomMode = 2, PanMode = 3, - SelectMode = 4 + TextMode = 4, + SelectMode = 5 }; class Container; @@ -49,6 +53,8 @@ class MenuBar; class ToolBar; +class MouseModeActionGroup; + class Figure : public Object, public MenuContainer, @@ -64,7 +70,7 @@ static Figure* create (const graphics_object& go); - MouseMode mouseMode (void) { return m_mouseMode; } + MouseMode mouseMode (void); Container* innerContainer (void); QWidget* menu (void); @@ -93,10 +99,12 @@ void addCustomToolBar (QToolBar* bar, bool visible); void showCustomToolBar (QToolBar* bar, bool visible); + void updateFigureToolBarAndMenuBar (void); + static void updateBoundingBoxHelper (void*); private slots: - void setMouseMode (MouseMode mode) { m_mouseMode = mode; } + void setMouseMode (MouseMode mode); void fileNewFigure (void); void fileCloseFigure (void); void editCopy (void); @@ -105,6 +113,8 @@ void helpAboutQtHandles (void); void updateMenuBar (void); void updateContainer (void); + void toggleAxes (void); + void toggleGrid (void); signals: void asyncUpdate (void); @@ -112,11 +122,11 @@ private: Container* m_container; bool m_blockUpdates; - MouseMode m_mouseMode, m_lastMouseMode; QToolBar* m_figureToolBar; MenuBar* m_menuBar; QRect m_innerRect; QRect m_outerRect; + MouseModeActionGroup* m_mouseModeGroup; }; }; // namespace QtHandles