Skip to content

Commit 3a5cc9d

Browse files
committed
qtdragon/hd -fix spindle override quick setting buttons
The default joint number had been changed to -1 from 0 recently, and the action buttons used the default joint number for the spindle #. There is no -1 spindle.
1 parent 80b7bff commit 3a5cc9d

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

share/qtvcp/screens/qtdragon/qtdragon.ui

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15339,6 +15339,9 @@ ZERO</string>
1533915339
<property name="spindle_over_action" stdset="0">
1534015340
<bool>true</bool>
1534115341
</property>
15342+
<property name="joint_number" stdset="0">
15343+
<number>0</number>
15344+
</property>
1534215345
<property name="float_num" stdset="0">
1534315346
<double>50.000000000000000</double>
1534415347
</property>
@@ -15425,6 +15428,9 @@ ZERO</string>
1542515428
<property name="spindle_over_action" stdset="0">
1542615429
<bool>true</bool>
1542715430
</property>
15431+
<property name="joint_number" stdset="0">
15432+
<number>0</number>
15433+
</property>
1542815434
</widget>
1542915435
</item>
1543015436
</layout>
@@ -17416,7 +17422,7 @@ ZERO</string>
1741617422
<number>2</number>
1741717423
</property>
1741817424
<property name="text">
17419-
<string>09:50:49 PM</string>
17425+
<string>06:31:29 PM</string>
1742017426
</property>
1742117427
<property name="alignment">
1742217428
<set>Qt::AlignCenter</set>
@@ -18496,7 +18502,7 @@ ZERO</string>
1849618502
<slot>btn_pause_clicked()</slot>
1849718503
</slots>
1849818504
<buttongroups>
18499-
<buttongroup name="page_buttonGroup"/>
1850018505
<buttongroup name="mode_buttonGroup"/>
18506+
<buttongroup name="page_buttonGroup"/>
1850118507
</buttongroups>
1850218508
</ui>

share/qtvcp/screens/qtdragon_hd/qtdragon_hd.ui

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14405,6 +14405,9 @@ ZERO</string>
1440514405
<property name="spindle_over_action" stdset="0">
1440614406
<bool>true</bool>
1440714407
</property>
14408+
<property name="joint_number" stdset="0">
14409+
<number>0</number>
14410+
</property>
1440814411
<property name="float_num" stdset="0">
1440914412
<double>50.000000000000000</double>
1441014413
</property>
@@ -14503,6 +14506,9 @@ ZERO</string>
1450314506
<property name="spindle_over_action" stdset="0">
1450414507
<bool>true</bool>
1450514508
</property>
14509+
<property name="joint_number" stdset="0">
14510+
<number>0</number>
14511+
</property>
1450614512
<property name="float_alt_num" stdset="0">
1450714513
<double>100.000000000000000</double>
1450814514
</property>
@@ -16881,7 +16887,7 @@ ANGULAR</string>
1688116887
<number>2</number>
1688216888
</property>
1688316889
<property name="text">
16884-
<string>06:07:54 PM</string>
16890+
<string>06:32:20 PM</string>
1688516891
</property>
1688616892
<property name="alignment">
1688716893
<set>Qt::AlignCenter</set>
@@ -18084,7 +18090,7 @@ ANGULAR</string>
1808418090
<slot>btn_pause_clicked()</slot>
1808518091
</slots>
1808618092
<buttongroups>
18087-
<buttongroup name="page_buttonGroup"/>
1808818093
<buttongroup name="mode_buttonGroup"/>
18094+
<buttongroup name="page_buttonGroup"/>
1808918095
</buttongroups>
1809018096
</ui>

0 commit comments

Comments
 (0)