Mercurial > hg > octave-nkf
comparison libgui/graphics/SliderControl.cc @ 18847:fe0e34be5576
maint: untabify recently added code files.
* Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, Canvas.h,
CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc,
Figure.h, GLCanvas.h, ListBoxControl.cc, Menu.cc, MouseModeActionGroup.cc,
Object.cc, Object.h, ObjectFactory.cc, ObjectProxy.cc, Panel.cc,
PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc,
QtHandlesUtils.h, RadioButtonControl.cc, SliderControl.cc, TextControl.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc,
__init_qt__.cc, pt-jit.cc, ov-classdef.cc, ov-classdef.h: Untabify code.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 27 Apr 2014 18:02:47 -0700 |
parents | fb96b7f55242 |
children | 3cc0734283dc |
comparison
equal
deleted
inserted
replaced
18846:9a6646cc7c3e | 18847:fe0e34be5576 |
---|---|
42 if (parent) | 42 if (parent) |
43 { | 43 { |
44 Container* container = parent->innerContainer (); | 44 Container* container = parent->innerContainer (); |
45 | 45 |
46 if (container) | 46 if (container) |
47 return new SliderControl (go, new QScrollBar (container)); | 47 return new SliderControl (go, new QScrollBar (container)); |
48 } | 48 } |
49 | 49 |
50 return 0; | 50 return 0; |
51 } | 51 } |
52 | 52 |
53 SliderControl::SliderControl (const graphics_object& go, | 53 SliderControl::SliderControl (const graphics_object& go, |
54 QAbstractSlider* slider) | 54 QAbstractSlider* slider) |
55 : BaseControl (go, slider), m_blockUpdates (false) | 55 : BaseControl (go, slider), m_blockUpdates (false) |
56 { | 56 { |
57 uicontrol::properties& up = properties<uicontrol> (); | 57 uicontrol::properties& up = properties<uicontrol> (); |
58 | 58 |
59 slider->setTracking (false); | 59 slider->setTracking (false); |
68 if (value.numel () > 0) | 68 if (value.numel () > 0) |
69 { | 69 { |
70 double dmin = up.get_min (), dmax = up.get_max (); | 70 double dmin = up.get_min (), dmax = up.get_max (); |
71 | 71 |
72 slider->setValue (xround (((value(0) - dmin) / (dmax - dmin)) | 72 slider->setValue (xround (((value(0) - dmin) / (dmax - dmin)) |
73 * RANGE_INT_MAX)); | 73 * RANGE_INT_MAX)); |
74 } | 74 } |
75 | 75 |
76 connect (slider, SIGNAL (valueChanged (int)), SLOT (valueChanged (int))); | 76 connect (slider, SIGNAL (valueChanged (int)), SLOT (valueChanged (int))); |
77 } | 77 } |
78 | 78 |
86 QScrollBar* slider = qWidget<QScrollBar> (); | 86 QScrollBar* slider = qWidget<QScrollBar> (); |
87 | 87 |
88 switch (pId) | 88 switch (pId) |
89 { | 89 { |
90 case uicontrol::properties::ID_SLIDERSTEP: | 90 case uicontrol::properties::ID_SLIDERSTEP: |
91 { | 91 { |
92 Matrix steps = up.get_sliderstep ().matrix_value (); | 92 Matrix steps = up.get_sliderstep ().matrix_value (); |
93 | 93 |
94 slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX)); | 94 slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX)); |
95 slider->setPageStep (xround (steps(1) * RANGE_INT_MAX)); | 95 slider->setPageStep (xround (steps(1) * RANGE_INT_MAX)); |
96 } | 96 } |
97 break; | 97 break; |
98 case uicontrol::properties::ID_VALUE: | 98 case uicontrol::properties::ID_VALUE: |
99 { | 99 { |
100 Matrix value = up.get_value ().matrix_value (); | 100 Matrix value = up.get_value ().matrix_value (); |
101 double dmax = up.get_max (), dmin = up.get_min (); | 101 double dmax = up.get_max (), dmin = up.get_min (); |
102 | 102 |
103 if (value.numel () > 0) | 103 if (value.numel () > 0) |
104 { | 104 { |
105 int ival = xround (((value(0) - dmin) / (dmax - dmin)) | 105 int ival = xround (((value(0) - dmin) / (dmax - dmin)) |
106 * RANGE_INT_MAX); | 106 * RANGE_INT_MAX); |
107 | 107 |
108 m_blockUpdates = true; | 108 m_blockUpdates = true; |
109 slider->setValue (ival); | 109 slider->setValue (ival); |
110 m_blockUpdates = false; | 110 m_blockUpdates = false; |
111 } | 111 } |
112 } | 112 } |
113 break; | 113 break; |
114 default: | 114 default: |
115 BaseControl::update (pId); | 115 BaseControl::update (pId); |
116 break; | 116 break; |
117 } | 117 } |
123 { | 123 { |
124 gh_manager::auto_lock lock; | 124 gh_manager::auto_lock lock; |
125 graphics_object go = object (); | 125 graphics_object go = object (); |
126 | 126 |
127 if (go.valid_object ()) | 127 if (go.valid_object ()) |
128 { | 128 { |
129 uicontrol::properties& up = Utils::properties<uicontrol> (go); | 129 uicontrol::properties& up = Utils::properties<uicontrol> (go); |
130 | 130 |
131 Matrix value = up.get_value ().matrix_value (); | 131 Matrix value = up.get_value ().matrix_value (); |
132 double dmin = up.get_min (), dmax = up.get_max (); | 132 double dmin = up.get_min (), dmax = up.get_max (); |
133 | 133 |
134 int ival_tmp = (value.numel () > 0 ? | 134 int ival_tmp = (value.numel () > 0 ? |
135 xround (((value(0) - dmin) / (dmax - dmin)) | 135 xround (((value(0) - dmin) / (dmax - dmin)) |
136 * RANGE_INT_MAX) : | 136 * RANGE_INT_MAX) : |
137 0); | 137 0); |
138 | 138 |
139 if (ival != ival_tmp || value.numel () > 0) | 139 if (ival != ival_tmp || value.numel () > 0) |
140 { | 140 { |
141 double dval = dmin + (ival * (dmax - dmin) / RANGE_INT_MAX); | 141 double dval = dmin + (ival * (dmax - dmin) / RANGE_INT_MAX); |
142 | 142 |
143 gh_manager::post_set (m_handle, "value", octave_value (dval)); | 143 gh_manager::post_set (m_handle, "value", octave_value (dval)); |
144 gh_manager::post_callback (m_handle, "callback"); | 144 gh_manager::post_callback (m_handle, "callback"); |
145 } | 145 } |
146 } | 146 } |
147 } | 147 } |
148 } | 148 } |
149 | 149 |
150 }; // namespace QtHandles | 150 }; // namespace QtHandles |