Mercurial > octave-nkf

comparison libgui/graphics/Canvas.cc @ 20002:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents 210b301a3e39
children 0376c1225660 f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
41 #include "gl2ps-renderer.h" 41 #include "gl2ps-renderer.h"
42 42
43 namespace QtHandles 43 namespace QtHandles
44 { 44 {
45 45
46 void Canvas::redraw (bool sync) 46 void
47 Canvas::redraw (bool sync)
47 { 48 {
48 QWidget *w = qWidget (); 49 QWidget *w = qWidget ();
49 50
50 if (w) 51 if (w)
51 { 52 {
54 else 55 else
55 w->update (); 56 w->update ();
56 } 57 }
57 } 58 }
58 59
59 void Canvas::blockRedraw (bool block) 60 void
61 Canvas::blockRedraw (bool block)
60 { 62 {
61 m_redrawBlocked = block; 63 m_redrawBlocked = block;
62 } 64 }
63 65
64 void Canvas::setCursor (MouseMode mode) 66 void
67 Canvas::setCursor (MouseMode mode)
65 { 68 {
66 QWidget *w = qWidget (); 69 QWidget *w = qWidget ();
67 70
68 if (w) 71 if (w)
69 { 72 {
89 break; 92 break;
90 } 93 }
91 } 94 }
92 } 95 }
93 96
94 void Canvas::print (const QString& file_cmd, const QString& term) 97 void
98 Canvas::print (const QString& file_cmd, const QString& term)
95 { 99 {
96 gh_manager::auto_lock lock; 100 gh_manager::auto_lock lock;
97 graphics_object obj = gh_manager::get_object (m_handle); 101 graphics_object obj = gh_manager::get_object (m_handle);
98 102
99 if (obj.valid_object ()) 103 if (obj.valid_object ())
102 106
103 gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ()); 107 gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ());
104 } 108 }
105 } 109 }
106 110
107 void Canvas::updateCurrentPoint(const graphics_object& fig, 111 void
108 const graphics_object& obj, QMouseEvent* event) 112 Canvas::updateCurrentPoint(const graphics_object& fig,
113 const graphics_object& obj, QMouseEvent* event)
109 { 114 {
110 gh_manager::auto_lock lock; 115 gh_manager::auto_lock lock;
111 116
112 gh_manager::post_set (fig.get_handle (), "currentpoint", 117 gh_manager::post_set (fig.get_handle (), "currentpoint",
113 Utils::figureCurrentPoint (fig, event), false); 118 Utils::figureCurrentPoint (fig, event), false);
139 false); 144 false);
140 } 145 }
141 } 146 }
142 } 147 }
143 148
144 void Canvas::canvasToggleAxes (const graphics_handle& handle) 149 void
150 Canvas::canvasToggleAxes (const graphics_handle& handle)
145 { 151 {
146 gh_manager::auto_lock lock; 152 gh_manager::auto_lock lock;
147 153
148 graphics_object go = gh_manager::get_object (handle); 154 graphics_object go = gh_manager::get_object (handle);
149 155
167 } 173 }
168 } 174 }
169 } 175 }
170 } 176 }
171 177
172 void Canvas::canvasToggleGrid (const graphics_handle& handle) 178 void
179 Canvas::canvasToggleGrid (const graphics_handle& handle)
173 { 180 {
174 gh_manager::auto_lock lock; 181 gh_manager::auto_lock lock;
175 182
176 graphics_object go = gh_manager::get_object (handle); 183 graphics_object go = gh_manager::get_object (handle);
177 184
217 ap.set_xlimmode ("auto"); 224 ap.set_xlimmode ("auto");
218 ap.set_ylimmode ("auto"); 225 ap.set_ylimmode ("auto");
219 ap.set_zlimmode ("auto"); 226 ap.set_zlimmode ("auto");
220 } 227 }
221 228
222 void Canvas::canvasAutoAxes (const graphics_handle& handle) 229 void
230 Canvas::canvasAutoAxes (const graphics_handle& handle)
223 { 231 {
224 gh_manager::auto_lock lock; 232 gh_manager::auto_lock lock;
225 233
226 graphics_object go = gh_manager::get_object (handle); 234 graphics_object go = gh_manager::get_object (handle);
227 235
245 } 253 }
246 } 254 }
247 } 255 }
248 } 256 }
249 257
250 void Canvas::canvasPaintEvent (void) 258 void
259 Canvas::canvasPaintEvent (void)
251 { 260 {
252 if (! m_redrawBlocked) 261 if (! m_redrawBlocked)
253 { 262 {
254 gh_manager::auto_lock lock; 263 gh_manager::auto_lock lock;
255 264
330 octave_scalar_map zm = ov_zm.scalar_map_value (); 339 octave_scalar_map zm = ov_zm.scalar_map_value ();
331 340
332 return zm.contents ("Direction").string_value (); 341 return zm.contents ("Direction").string_value ();
333 } 342 }
334 343
335 void Canvas::canvasMouseMoveEvent (QMouseEvent* event) 344 void
345 Canvas::canvasMouseMoveEvent (QMouseEvent* event)
336 { 346 {
337 gh_manager::auto_lock lock; 347 gh_manager::auto_lock lock;
338 graphics_object ax = gh_manager::get_object (m_mouseAxes); 348 graphics_object ax = gh_manager::get_object (m_mouseAxes);
339 349
340 if (m_mouseMode != NoMode && ax.valid_object ()) 350 if (m_mouseMode != NoMode && ax.valid_object ())
399 "windowbuttonmotionfcn"); 409 "windowbuttonmotionfcn");
400 } 410 }
401 } 411 }
402 } 412 }
403 413
404 void Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event) 414 void
415 Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event)
405 { 416 {
406 if (event->buttons () != Qt::LeftButton) 417 if (event->buttons () != Qt::LeftButton)
407 return; 418 return;
408 419
409 gh_manager::auto_lock lock; 420 gh_manager::auto_lock lock;
483 } 494 }
484 495
485 return retval; 496 return retval;
486 } 497 }
487 498
488 void Canvas::canvasMousePressEvent (QMouseEvent* event) 499 void
500 Canvas::canvasMousePressEvent (QMouseEvent* event)
489 { 501 {
490 gh_manager::auto_lock lock; 502 gh_manager::auto_lock lock;
491 graphics_object obj = gh_manager::get_object (m_handle); 503 graphics_object obj = gh_manager::get_object (m_handle);
492 504
493 if (obj.valid_object ()) 505 if (obj.valid_object ())
654 break; 666 break;
655 } 667 }
656 } 668 }
657 } 669 }
658 670
659 void Canvas::canvasMouseReleaseEvent (QMouseEvent* event) 671 void
672 Canvas::canvasMouseReleaseEvent (QMouseEvent* event)
660 { 673 {
661 if ((m_mouseMode == ZoomInMode || m_mouseMode == ZoomOutMode) 674 if ((m_mouseMode == ZoomInMode || m_mouseMode == ZoomOutMode)
662 && m_mouseAxes.ok ()) 675 && m_mouseAxes.ok ())
663 { 676 {
664 gh_manager::auto_lock lock; 677 gh_manager::auto_lock lock;
720 733
721 m_mouseAxes = graphics_handle (); 734 m_mouseAxes = graphics_handle ();
722 m_mouseMode = NoMode; 735 m_mouseMode = NoMode;
723 } 736 }
724 737
725 void Canvas::canvasWheelEvent (QWheelEvent* event) 738 void
739 Canvas::canvasWheelEvent (QWheelEvent* event)
726 { 740 {
727 gh_manager::auto_lock lock; 741 gh_manager::auto_lock lock;
728 graphics_object obj = gh_manager::get_object (m_handle); 742 graphics_object obj = gh_manager::get_object (m_handle);
729 743
730 if (obj.valid_object ()) 744 if (obj.valid_object ())
827 redraw (false); 841 redraw (false);
828 } 842 }
829 } 843 }
830 } 844 }
831 845
832 bool Canvas::canvasKeyPressEvent (QKeyEvent* event) 846 bool
847 Canvas::canvasKeyPressEvent (QKeyEvent* event)
833 { 848 {
834 if (m_eventMask & KeyPress) 849 if (m_eventMask & KeyPress)
835 { 850 {
836 octave_scalar_map eventData = Utils::makeKeyEventStruct (event); 851 octave_scalar_map eventData = Utils::makeKeyEventStruct (event);
837 852
843 } 858 }
844 859
845 return false; 860 return false;
846 } 861 }
847 862
848 bool Canvas::canvasKeyReleaseEvent (QKeyEvent* event) 863 bool
864 Canvas::canvasKeyReleaseEvent (QKeyEvent* event)
849 { 865 {
850 if (! event->isAutoRepeat () && (m_eventMask & KeyRelease)) 866 if (! event->isAutoRepeat () && (m_eventMask & KeyRelease))
851 { 867 {
852 gh_manager::post_callback (m_handle, "keyreleasefcn", 868 gh_manager::post_callback (m_handle, "keyreleasefcn",
853 Utils::makeKeyEventStruct (event)); 869 Utils::makeKeyEventStruct (event));
856 } 872 }
857 873
858 return false; 874 return false;
859 } 875 }
860 876
861 Canvas* Canvas::create (const std::string& /* name */, QWidget* parent, 877 Canvas*
862 const graphics_handle& handle) 878 Canvas::create (const std::string& /* name */, QWidget* parent,
879 const graphics_handle& handle)
863 { 880 {
864 // Only OpenGL 881 // Only OpenGL
865 return new GLCanvas (parent, handle); 882 return new GLCanvas (parent, handle);
866 } 883 }
867 884