Skip to content

Commit f5cff62

Browse files
c-morleyc-morley
committed
sim panel -add scale buttons and MPG dial
1 parent 9f55fc7 commit f5cff62

2 files changed

Lines changed: 206 additions & 50 deletions

File tree

‎configs/sim/qtdragon/qtdragon_xyz/panel.hal‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
net rate halui.axis.jog-speed panel.jog-rate
22

33
net sx halui.axis.x.select panel.axis-x
4+
net sx axis.x.jog-enable
45
net sy halui.axis.y.select panel.axis-y
6+
net sy axis.y.jog-enable
57
net sz halui.axis.z.select panel.axis-z
8+
net sz axis.z.jog-enable
9+
10+
net mpg-scale axis.x.jog-scale panel.mpg-scale
11+
net mpg-scale axis.y.jog-scale
12+
net mpg-scale axis.z.jog-scale
13+
14+
net mpg-count panel.mpg-wheel-s
15+
net mpg-count qtdragon.mpg-in
16+
net mpg-count axis.x.jog-counts
17+
net mpg-count axis.y.jog-counts
18+
net mpg-count axis.z.jog-counts
619

720
net jog-p halui.axis.selected.plus panel.jog-pos
821
net jog-m halui.axis.selected.minus panel.jog-neg

‎configs/sim/qtdragon/qtdragon_xyz/panel.ui‎

Lines changed: 193 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>404</width>
10-
<height>560</height>
9+
<width>418</width>
10+
<height>587</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -91,55 +91,190 @@
9191
</widget>
9292
</item>
9393
<item>
94-
<widget class="QGroupBox" name="groupBox_4">
95-
<property name="title">
96-
<string>Axis Jog</string>
97-
</property>
98-
<layout class="QHBoxLayout" name="horizontalLayout_5">
99-
<item>
100-
<widget class="PushButton" name="pushbutton_7">
101-
<property name="text">
102-
<string>+</string>
103-
</property>
104-
<property name="pin_name" stdset="0">
105-
<string>jog-pos</string>
106-
</property>
107-
</widget>
108-
</item>
109-
<item>
110-
<widget class="PushButton" name="pushbutton_8">
111-
<property name="text">
112-
<string>-</string>
113-
</property>
114-
<property name="pin_name" stdset="0">
115-
<string>jog-neg</string>
116-
</property>
117-
</widget>
118-
</item>
119-
</layout>
120-
</widget>
94+
<layout class="QHBoxLayout" name="horizontalLayout_8">
95+
<item>
96+
<widget class="QGroupBox" name="groupBox_4">
97+
<property name="title">
98+
<string>Axis Jog</string>
99+
</property>
100+
<layout class="QHBoxLayout" name="horizontalLayout_5">
101+
<item>
102+
<widget class="PushButton" name="pushbutton_7">
103+
<property name="text">
104+
<string>+</string>
105+
</property>
106+
<property name="pin_name" stdset="0">
107+
<string>jog-pos</string>
108+
</property>
109+
</widget>
110+
</item>
111+
<item>
112+
<widget class="PushButton" name="pushbutton_8">
113+
<property name="text">
114+
<string>-</string>
115+
</property>
116+
<property name="pin_name" stdset="0">
117+
<string>jog-neg</string>
118+
</property>
119+
</widget>
120+
</item>
121+
</layout>
122+
</widget>
123+
</item>
124+
<item>
125+
<widget class="QGroupBox" name="groupBox_2">
126+
<property name="title">
127+
<string>jog rate</string>
128+
</property>
129+
<layout class="QHBoxLayout" name="horizontalLayout_3">
130+
<item>
131+
<widget class="StatusSlider" name="statusslider">
132+
<property name="orientation">
133+
<enum>Qt::Horizontal</enum>
134+
</property>
135+
<property name="pin_name" stdset="0">
136+
<string>jog-rate</string>
137+
</property>
138+
<property name="jograte_rate" stdset="0">
139+
<bool>true</bool>
140+
</property>
141+
</widget>
142+
</item>
143+
</layout>
144+
</widget>
145+
</item>
146+
</layout>
121147
</item>
122148
<item>
123-
<widget class="QGroupBox" name="groupBox_2">
124-
<property name="title">
125-
<string>jog rate</string>
126-
</property>
127-
<layout class="QHBoxLayout" name="horizontalLayout_3">
128-
<item>
129-
<widget class="StatusSlider" name="statusslider">
130-
<property name="orientation">
131-
<enum>Qt::Horizontal</enum>
132-
</property>
133-
<property name="pin_name" stdset="0">
134-
<string>jog-rate</string>
135-
</property>
136-
<property name="jograte_rate" stdset="0">
137-
<bool>true</bool>
138-
</property>
139-
</widget>
140-
</item>
141-
</layout>
142-
</widget>
149+
<layout class="QHBoxLayout" name="horizontalLayout_11">
150+
<item>
151+
<widget class="QGroupBox" name="">
152+
<property name="title">
153+
<string>MPG</string>
154+
</property>
155+
<layout class="QHBoxLayout" name="horizontalLayout_7">
156+
<item>
157+
<widget class="PushButton" name="pushbutton_13">
158+
<property name="text">
159+
<string>.001</string>
160+
</property>
161+
<property name="checkable">
162+
<bool>true</bool>
163+
</property>
164+
<property name="checked">
165+
<bool>true</bool>
166+
</property>
167+
<property name="autoExclusive">
168+
<bool>true</bool>
169+
</property>
170+
<property name="pin_name" stdset="0">
171+
<string>mpg-scale-small</string>
172+
</property>
173+
<property name="indicator_option" stdset="0">
174+
<bool>true</bool>
175+
</property>
176+
<property name="pin_type" stdset="0">
177+
<enum>PushButton::FLOAT</enum>
178+
</property>
179+
<property name="groupPinName" stdset="0">
180+
<string>mpg-scale</string>
181+
</property>
182+
<property name="exclusiveHALValue" stdset="0">
183+
<double>0.001000000000000</double>
184+
</property>
185+
<attribute name="buttonGroup">
186+
<string notr="true">buttonGroup_mpgscale</string>
187+
</attribute>
188+
</widget>
189+
</item>
190+
<item>
191+
<widget class="PushButton" name="pushbutton_14">
192+
<property name="text">
193+
<string>.01</string>
194+
</property>
195+
<property name="checkable">
196+
<bool>true</bool>
197+
</property>
198+
<property name="autoExclusive">
199+
<bool>true</bool>
200+
</property>
201+
<property name="pin_name" stdset="0">
202+
<string>mpg-scale-med</string>
203+
</property>
204+
<property name="indicator_option" stdset="0">
205+
<bool>true</bool>
206+
</property>
207+
<property name="pin_type" stdset="0">
208+
<enum>PushButton::FLOAT</enum>
209+
</property>
210+
<property name="groupPinName" stdset="0">
211+
<string>mpg-scale</string>
212+
</property>
213+
<property name="exclusiveHALValue" stdset="0">
214+
<double>0.010000000000000</double>
215+
</property>
216+
<attribute name="buttonGroup">
217+
<string notr="true">buttonGroup_mpgscale</string>
218+
</attribute>
219+
</widget>
220+
</item>
221+
<item>
222+
<widget class="PushButton" name="pushbutton_1">
223+
<property name="text">
224+
<string>.1</string>
225+
</property>
226+
<property name="checkable">
227+
<bool>true</bool>
228+
</property>
229+
<property name="autoExclusive">
230+
<bool>true</bool>
231+
</property>
232+
<property name="pin_name" stdset="0">
233+
<string>mpg-scale-large</string>
234+
</property>
235+
<property name="indicator_option" stdset="0">
236+
<bool>true</bool>
237+
</property>
238+
<property name="pin_type" stdset="0">
239+
<enum>PushButton::FLOAT</enum>
240+
</property>
241+
<property name="groupPinName" stdset="0">
242+
<string>mpg-scale</string>
243+
</property>
244+
<property name="exclusiveHALValue" stdset="0">
245+
<double>0.100000000000000</double>
246+
</property>
247+
<attribute name="buttonGroup">
248+
<string notr="true">buttonGroup_mpgscale</string>
249+
</attribute>
250+
</widget>
251+
</item>
252+
</layout>
253+
</widget>
254+
</item>
255+
<item>
256+
<widget class="Dial" name="dial">
257+
<property name="minimumSize">
258+
<size>
259+
<width>0</width>
260+
<height>74</height>
261+
</size>
262+
</property>
263+
<property name="invertedAppearance">
264+
<bool>false</bool>
265+
</property>
266+
<property name="wrapping">
267+
<bool>true</bool>
268+
</property>
269+
<property name="notchesVisible">
270+
<bool>false</bool>
271+
</property>
272+
<property name="pin_name" stdset="0">
273+
<string>mpg-wheel</string>
274+
</property>
275+
</widget>
276+
</item>
277+
</layout>
143278
</item>
144279
<item>
145280
<widget class="QGroupBox" name="groupBox_3">
@@ -341,7 +476,7 @@
341476
<rect>
342477
<x>0</x>
343478
<y>0</y>
344-
<width>404</width>
479+
<width>418</width>
345480
<height>22</height>
346481
</rect>
347482
</property>
@@ -354,6 +489,11 @@
354489
<extends>QPushButton</extends>
355490
<header>qtvcp.widgets.simple_widgets</header>
356491
</customwidget>
492+
<customwidget>
493+
<class>Dial</class>
494+
<extends>QDial</extends>
495+
<header>qtvcp.widgets.simple_widgets</header>
496+
</customwidget>
357497
<customwidget>
358498
<class>StatusSlider</class>
359499
<extends>QSlider</extends>
@@ -362,4 +502,7 @@
362502
</customwidgets>
363503
<resources/>
364504
<connections/>
505+
<buttongroups>
506+
<buttongroup name="buttonGroup_mpgscale"/>
507+
</buttongroups>
365508
</ui>

0 commit comments

Comments
 (0)