Mercurial > octave

comparison libgui/graphics/Figure.h @ 26869:992f55ef87f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795) * Figure.[cc,h] (mouse_mode_to_string, mouse_mode_from_string): Remove functions. (createFigureToolBarAndMenuBar, updateFigureToolBarAndMenuBar): Remove methods. (Figure::Figure): Instantiate the menubar here. Simplify size handling now that the toolbar is created in addCustomToolBar. (Figure::addCustomToolBar): Add optional argument to signal if the toolbar is the default one. (Figure::autoAxes, Figrue::toggleGrid, Figure::toggleAxes): Remove methods. * GLCanvas.[cc,h] (GLCanvas::autoAxes, GLCanvas::toggleGrid, GLCanvas::toggleAxes): Ditto. * Canvas.[cc,h] (Canvas::canvasAutoAxes, Canvas::canvasToggleGrid, Canvas::canvasToggleAxes): Ditto. (Canvas::setCursor): Use resourse_manager to retrieve icons. * MouseModeActionGroup.[cc, h]: Remove unnecessary class file. * __add_default_menu__.m: Add default toobar and associated buttons. * libgui/graphics/qthandles.qrc: Remove file * libgui/graphics/images: Remove directory. * libgui/graphics/module.mk: Update to eliminate the Crystal icons resources. * libgui/src/resources.qrc: Include new figure-* png icons * libgui/src/module.mk: Include new figure-* png icons * libgui/src/icons/icons_license: Document the origin of figure-* icons
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Thu, 07 Mar 2019 22:53:33 +0100
parents 278ae90567a7
children cb5c1ea2062c
comparison
equal deleted inserted replaced
26868:23894ad6f7d1 26869:992f55ef87f5
37 namespace QtHandles 37 namespace QtHandles
38 { 38 {
39 39
40 enum MouseMode 40 enum MouseMode
41 { 41 {
42 // NOTE: These values must match the order of the buttons in the 42 NoMode,
43 // MouseModeActionGroup object. 43 RotateMode,
44 44 ZoomInMode,
45 NoMode = 0, 45 ZoomOutMode,
46 RotateMode = 1, 46 PanMode,
47 ZoomInMode = 2, 47 SelectMode,
48 ZoomOutMode = 3, 48 TextMode
49 PanMode = 4,
50 TextMode = 5
51 }; 49 };
52 50
53 class Container; 51 class Container;
54 class FigureWindow; 52 class FigureWindow;
55 class MenuBar; 53 class MenuBar;
56 class ToolBar; 54 class ToolBar;
57
58 class MouseModeActionGroup;
59 55
60 class Figure : 56 class Figure :
61 public Object, 57 public Object,
62 public MenuContainer, 58 public MenuContainer,
63 public GenericEventNotifyReceiver 59 public GenericEventNotifyReceiver
99 void update (int pId); 95 void update (int pId);
100 void updateBoundingBox (bool internal = false, int flags = 0); 96 void updateBoundingBox (bool internal = false, int flags = 0);
101 void beingDeleted (void); 97 void beingDeleted (void);
102 98
103 private: 99 private:
104 void createFigureToolBarAndMenuBar (void);
105 void showFigureToolBar (bool visible); 100 void showFigureToolBar (bool visible);
106 void addCustomToolBar (QToolBar *bar, bool visible); 101 void addCustomToolBar (QToolBar *bar, bool visible, bool isdefault);
107 void showCustomToolBar (QToolBar *bar, bool visible); 102 void showCustomToolBar (QToolBar *bar, bool visible);
108 void updateFigureToolBarAndMenuBar (void);
109 void set_geometry (QRect r); 103 void set_geometry (QRect r);
110 104
111 void enableMouseTracking (void); 105 void enableMouseTracking (void);
112 106
113 private slots: 107 private slots:
114 void setMouseMode (MouseMode mode);
115 void updateFigureHeight (int delta_h); 108 void updateFigureHeight (int delta_h);
116 void updateContainer (void); 109 void updateContainer (void);
117 void toggleAxes (void);
118 void toggleGrid (void);
119 void autoAxes (void);
120 void figureWindowShown (); 110 void figureWindowShown ();
121 void screenChanged (QScreen*); 111 void screenChanged (QScreen*);
122 112
123 public slots: 113 public slots:
124 uint8NDArray slotGetPixels (void); 114 uint8NDArray slotGetPixels (void);
132 QToolBar *m_figureToolBar; 122 QToolBar *m_figureToolBar;
133 MenuBar *m_menuBar; 123 MenuBar *m_menuBar;
134 QStatusBar *m_statusBar; 124 QStatusBar *m_statusBar;
135 QRect m_innerRect; 125 QRect m_innerRect;
136 QRect m_outerRect; 126 QRect m_outerRect;
137 MouseModeActionGroup *m_mouseModeGroup;
138 int m_previousHeight; 127 int m_previousHeight;
139 bool m_resizable; 128 bool m_resizable;
140 }; 129 };
141 130
142 } 131 }