Skip to content

Commit 548a984

Browse files
c-morleyc-morley
committed
gmoccapy -update vcp panel for angular axes
1 parent fad3a55 commit 548a984

2 files changed

Lines changed: 113 additions & 16 deletions

File tree

‎configs/sim/gmoccapy/panel.hal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
net rate halui.axis.jog-speed panel.Jog-rate-f
1+
net rate halui.axis.jog-speed panel.jog-rate-f
22

33
net sx halui.axis.x.select panel.axis-x
44
net sy halui.axis.y.select panel.axis-y

‎configs/sim/gmoccapy/panel.ui‎

Lines changed: 112 additions & 15 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>537</height>
9+
<width>389</width>
10+
<height>600</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -22,11 +22,26 @@
2222
<property name="title">
2323
<string>Axis Selection</string>
2424
</property>
25-
<layout class="QHBoxLayout" name="horizontalLayout_2">
26-
<item>
27-
<widget class="PushButton" name="pushbutton_9">
25+
<layout class="QGridLayout" name="gridLayout">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>3</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
36+
<number>0</number>
37+
</property>
38+
<property name="horizontalSpacing">
39+
<number>4</number>
40+
</property>
41+
<item row="0" column="4">
42+
<widget class="PushButton" name="pushbutton_3">
2843
<property name="text">
29-
<string>None</string>
44+
<string>Z</string>
3045
</property>
3146
<property name="checkable">
3247
<bool>true</bool>
@@ -35,11 +50,11 @@
3550
<bool>true</bool>
3651
</property>
3752
<property name="pin_name" stdset="0">
38-
<string>axis-none</string>
53+
<string>axis-z</string>
3954
</property>
4055
</widget>
4156
</item>
42-
<item>
57+
<item row="0" column="2">
4358
<widget class="PushButton" name="pushbutton">
4459
<property name="text">
4560
<string>X</string>
@@ -55,7 +70,23 @@
5570
</property>
5671
</widget>
5772
</item>
58-
<item>
73+
<item row="0" column="1">
74+
<widget class="PushButton" name="pushbutton_9">
75+
<property name="text">
76+
<string>None</string>
77+
</property>
78+
<property name="checkable">
79+
<bool>true</bool>
80+
</property>
81+
<property name="autoExclusive">
82+
<bool>true</bool>
83+
</property>
84+
<property name="pin_name" stdset="0">
85+
<string>axis-none</string>
86+
</property>
87+
</widget>
88+
</item>
89+
<item row="0" column="3">
5990
<widget class="PushButton" name="pushbutton_2">
6091
<property name="text">
6192
<string>Y</string>
@@ -71,10 +102,10 @@
71102
</property>
72103
</widget>
73104
</item>
74-
<item>
75-
<widget class="PushButton" name="pushbutton_3">
105+
<item row="1" column="4">
106+
<widget class="PushButton" name="pushbutton_15">
76107
<property name="text">
77-
<string>Z</string>
108+
<string>C</string>
78109
</property>
79110
<property name="checkable">
80111
<bool>true</bool>
@@ -83,7 +114,39 @@
83114
<bool>true</bool>
84115
</property>
85116
<property name="pin_name" stdset="0">
86-
<string>axis-z</string>
117+
<string>axis-c</string>
118+
</property>
119+
</widget>
120+
</item>
121+
<item row="1" column="3">
122+
<widget class="PushButton" name="pushbutton_14">
123+
<property name="text">
124+
<string>B</string>
125+
</property>
126+
<property name="checkable">
127+
<bool>true</bool>
128+
</property>
129+
<property name="autoExclusive">
130+
<bool>true</bool>
131+
</property>
132+
<property name="pin_name" stdset="0">
133+
<string>axis-b</string>
134+
</property>
135+
</widget>
136+
</item>
137+
<item row="1" column="2">
138+
<widget class="PushButton" name="pushbutton_13">
139+
<property name="text">
140+
<string>A</string>
141+
</property>
142+
<property name="checkable">
143+
<bool>true</bool>
144+
</property>
145+
<property name="autoExclusive">
146+
<bool>true</bool>
147+
</property>
148+
<property name="pin_name" stdset="0">
149+
<string>axis-a</string>
87150
</property>
88151
</widget>
89152
</item>
@@ -96,6 +159,18 @@
96159
<string>Axis Jog</string>
97160
</property>
98161
<layout class="QHBoxLayout" name="horizontalLayout_5">
162+
<property name="leftMargin">
163+
<number>0</number>
164+
</property>
165+
<property name="topMargin">
166+
<number>3</number>
167+
</property>
168+
<property name="rightMargin">
169+
<number>0</number>
170+
</property>
171+
<property name="bottomMargin">
172+
<number>0</number>
173+
</property>
99174
<item>
100175
<widget class="PushButton" name="pushbutton_7">
101176
<property name="text">
@@ -134,7 +209,29 @@
134209
<enum>Qt::Horizontal</enum>
135210
</property>
136211
<property name="pin_name" stdset="0">
137-
<string>Jog-rate</string>
212+
<string>jog-rate</string>
213+
</property>
214+
</widget>
215+
</item>
216+
</layout>
217+
</widget>
218+
</item>
219+
<item>
220+
<widget class="QGroupBox" name="groupBox_6">
221+
<property name="title">
222+
<string>jAngular jog rate</string>
223+
</property>
224+
<layout class="QHBoxLayout" name="horizontalLayout_7">
225+
<item>
226+
<widget class="Slider" name="slider_angular">
227+
<property name="maximum">
228+
<number>1800</number>
229+
</property>
230+
<property name="orientation">
231+
<enum>Qt::Horizontal</enum>
232+
</property>
233+
<property name="pin_name" stdset="0">
234+
<string>jog-rate-angular</string>
138235
</property>
139236
</widget>
140237
</item>
@@ -341,7 +438,7 @@
341438
<rect>
342439
<x>0</x>
343440
<y>0</y>
344-
<width>404</width>
441+
<width>389</width>
345442
<height>22</height>
346443
</rect>
347444
</property>

0 commit comments

Comments
 (0)