Skip to content

Commit dfb41ba

Browse files
committed
qtdragon_hd -fix error when switching to the tool tab
Needed to adjust the name scheme for 4th and 5th axes
1 parent 5dbdddc commit dfb41ba

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

share/qtvcp/screens/qtdragon_hd/qtdragon_hd.ui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11871,7 +11871,7 @@ CAMERA</string>
1187111871
</size>
1187211872
</property>
1187311873
<property name="text">
11874-
<string>TOOL Y</string>
11874+
<string>TOOL</string>
1187511875
</property>
1187611876
<property name="popupMode">
1187711877
<enum>QToolButton::InstantPopup</enum>
@@ -12146,7 +12146,7 @@ CAMERA</string>
1214612146
</size>
1214712147
</property>
1214812148
<property name="text">
12149-
<string>TOOL X</string>
12149+
<string>TOOL</string>
1215012150
</property>
1215112151
<property name="checkable">
1215212152
<bool>false</bool>
@@ -12520,7 +12520,7 @@ CAMERA</string>
1252012520
</size>
1252112521
</property>
1252212522
<property name="text">
12523-
<string>TOOL Z</string>
12523+
<string>TOOL</string>
1252412524
</property>
1252512525
<property name="popupMode">
1252612526
<enum>QToolButton::InstantPopup</enum>
@@ -16760,7 +16760,7 @@ ANGULAR</string>
1676016760
<number>2</number>
1676116761
</property>
1676216762
<property name="text">
16763-
<string>11:47:11 AM</string>
16763+
<string>10:25:03 PM</string>
1676416764
</property>
1676516765
<property name="alignment">
1676616766
<set>Qt::AlignCenter</set>
@@ -17950,7 +17950,7 @@ ANGULAR</string>
1795017950
<slot>btn_pause_clicked()</slot>
1795117951
</slots>
1795217952
<buttongroups>
17953-
<buttongroup name="page_buttonGroup"/>
1795417953
<buttongroup name="mode_buttonGroup"/>
17954+
<buttongroup name="page_buttonGroup"/>
1795517955
</buttongroups>
1795617956
</ui>

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,8 +1466,11 @@ def adjust_stacked_widgets(self,requestedIndex):
14661466
num = 1
14671467
else:
14681468
num = 0
1469-
for i in INFO.AVAILABLE_AXES:
1470-
self.w['dro_button_stack_%s'%i.lower()].setCurrentIndex(num)
1469+
for n,i in enumerate(INFO.AVAILABLE_AXES):
1470+
if n >2:
1471+
self.w['dro_button_stack_%s'%(n+1)].setCurrentIndex(num)
1472+
else:
1473+
self.w['dro_button_stack_%s'%i.lower()].setCurrentIndex(num)
14711474

14721475
# adjust the stacked widget
14731476
if stacked_index > PAGE_UNCHANGED:

0 commit comments

Comments
 (0)