Skip to content

Commit 7b3fe28

Browse files
committed
qtdragon -test files update
1 parent f49fce0 commit 7b3fe28

2 files changed

Lines changed: 18 additions & 13 deletions

File tree

configs/sim/qtdragon/qtdragon_xyz/panel.hal

Lines changed: 8 additions & 3 deletions
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
22

33
net sx halui.axis.x.select panel.axis-x
44
net sy halui.axis.y.select panel.axis-y
@@ -7,12 +7,17 @@ net sz halui.axis.z.select panel.axis-z
77
net jog-p halui.axis.selected.plus panel.jog-pos
88
net jog-m halui.axis.selected.minus panel.jog-neg
99

10-
#net m0 halui.gui.mdi-command-MACRO0 panel.mdi-0
11-
#net m1 halui.gui.mdi-command-MACRO1 panel.mdi-1
10+
net m0 halui.gui.mdi-command-MACRO0 panel.mdi-0
11+
net m1 halui.gui.mdi-command-MACRO1 panel.mdi-1
1212
#net m2 halui.gui.mdi-command-0 panel.mdi-2
1313

14+
net man panel.manual-mode halui.mode.manual
15+
net mdi panel.mdi-mode halui.mode.mdi
16+
net auto panel.auto-mode halui.mode.auto
17+
1418
net pause halui.cycle.start panel.cycle-start
1519
net start halui.cycle.pause panel.cycle-pause
20+
net abort halui.abort panel.cycle-abort
1621

1722
net cancel halui.gui.cancel panel.cancel
1823
net ok halui.gui.ok panel.ok

configs/sim/qtdragon/qtdragon_xyz/panel.ui

Lines changed: 10 additions & 10 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>313</width>
10-
<height>467</height>
9+
<width>404</width>
10+
<height>560</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -126,15 +126,15 @@
126126
</property>
127127
<layout class="QHBoxLayout" name="horizontalLayout_3">
128128
<item>
129-
<widget class="Slider" name="slider">
130-
<property name="maximum">
131-
<number>300</number>
132-
</property>
129+
<widget class="StatusSlider" name="statusslider">
133130
<property name="orientation">
134131
<enum>Qt::Horizontal</enum>
135132
</property>
136133
<property name="pin_name" stdset="0">
137-
<string>Jog-rate</string>
134+
<string>jog-rate</string>
135+
</property>
136+
<property name="jograte_rate" stdset="0">
137+
<bool>true</bool>
138138
</property>
139139
</widget>
140140
</item>
@@ -341,7 +341,7 @@
341341
<rect>
342342
<x>0</x>
343343
<y>0</y>
344-
<width>313</width>
344+
<width>404</width>
345345
<height>22</height>
346346
</rect>
347347
</property>
@@ -355,9 +355,9 @@
355355
<header>qtvcp.widgets.simple_widgets</header>
356356
</customwidget>
357357
<customwidget>
358-
<class>Slider</class>
358+
<class>StatusSlider</class>
359359
<extends>QSlider</extends>
360-
<header>qtvcp.widgets.simple_widgets</header>
360+
<header>qtvcp.widgets.status_slider</header>
361361
</customwidget>
362362
</customwidgets>
363363
<resources/>

0 commit comments

Comments
 (0)