Mercurial > octave-nkf

comparison libgui/graphics/SliderControl.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 fe0e34be5576
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
33 #define RANGE_INT_MAX 1000000 33 #define RANGE_INT_MAX 1000000
34 34
35 namespace QtHandles 35 namespace QtHandles
36 { 36 {
37 37
38 SliderControl* SliderControl::create (const graphics_object& go) 38 SliderControl*
39 SliderControl::create (const graphics_object& go)
39 { 40 {
40 Object* parent = Object::parentObject (go); 41 Object* parent = Object::parentObject (go);
41 42
42 if (parent) 43 if (parent)
43 { 44 {
50 return 0; 51 return 0;
51 } 52 }
52 53
53 SliderControl::SliderControl (const graphics_object& go, 54 SliderControl::SliderControl (const graphics_object& go,
54 QAbstractSlider* slider) 55 QAbstractSlider* slider)
55 : BaseControl (go, slider), m_blockUpdates (false) 56 : BaseControl (go, slider), m_blockUpdates (false)
56 { 57 {
57 uicontrol::properties& up = properties<uicontrol> (); 58 uicontrol::properties& up = properties<uicontrol> ();
58 59
59 slider->setTracking (false); 60 slider->setTracking (false);
60 Matrix bb = up.get_boundingbox (); 61 Matrix bb = up.get_boundingbox ();
78 79
79 SliderControl::~SliderControl (void) 80 SliderControl::~SliderControl (void)
80 { 81 {
81 } 82 }
82 83
83 void SliderControl::update (int pId) 84 void
85 SliderControl::update (int pId)
84 { 86 {
85 uicontrol::properties& up = properties<uicontrol> (); 87 uicontrol::properties& up = properties<uicontrol> ();
86 QScrollBar* slider = qWidget<QScrollBar> (); 88 QScrollBar* slider = qWidget<QScrollBar> ();
87 89
88 switch (pId) 90 switch (pId)
89 { 91 {
90 case uicontrol::properties::ID_SLIDERSTEP: 92 case uicontrol::properties::ID_SLIDERSTEP:
91 { 93 {
92 Matrix steps = up.get_sliderstep ().matrix_value (); 94 Matrix steps = up.get_sliderstep ().matrix_value ();
93 95
94 slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX)); 96 slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX));
95 slider->setPageStep (xround (steps(1) * RANGE_INT_MAX)); 97 slider->setPageStep (xround (steps(1) * RANGE_INT_MAX));
96 } 98 }
97 break; 99 break;
100
98 case uicontrol::properties::ID_VALUE: 101 case uicontrol::properties::ID_VALUE:
99 { 102 {
100 Matrix value = up.get_value ().matrix_value (); 103 Matrix value = up.get_value ().matrix_value ();
101 double dmax = up.get_max (), dmin = up.get_min (); 104 double dmax = up.get_max (), dmin = up.get_min ();
102 105
103 if (value.numel () > 0) 106 if (value.numel () > 0)
104 { 107 {
105 int ival = xround (((value(0) - dmin) / (dmax - dmin)) 108 int ival = xround (((value(0) - dmin) / (dmax - dmin))
106 * RANGE_INT_MAX); 109 * RANGE_INT_MAX);
107 110
108 m_blockUpdates = true; 111 m_blockUpdates = true;
109 slider->setValue (ival); 112 slider->setValue (ival);
110 m_blockUpdates = false; 113 m_blockUpdates = false;
111 } 114 }
112 } 115 }
113 break; 116 break;
117
114 default: 118 default:
115 BaseControl::update (pId); 119 BaseControl::update (pId);
116 break; 120 break;
117 } 121 }
118 } 122 }
119 123
120 void SliderControl::valueChanged (int ival) 124 void
125 SliderControl::valueChanged (int ival)
121 { 126 {
122 if (! m_blockUpdates) 127 if (! m_blockUpdates)
123 { 128 {
124 gh_manager::auto_lock lock; 129 gh_manager::auto_lock lock;
125 graphics_object go = object (); 130 graphics_object go = object ();