Skip to content

Commit

Permalink
qtdragon/hd -change joint numbers to -1, so joint number is looked up
Browse files Browse the repository at this point in the history 
when jogging in joint mode, the joint number is converted from the axis letter.
so machines such as YYXZ (X is not joint 0 etc) jog properly.
  • Loading branch information
@c-morley
c-morley committed Oct 4, 2023
1 parent 681204d commit cf8cfc1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
24 changes: 12 additions & 12 deletions share/qtvcp/screens/qtdragon/qtdragon.ui
View file
Expand Up @@ -7,7 +7,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1631</width>
<width>1280</width>
<height>933</height>
</rect>
</property>
Expand Down Expand Up @@ -8752,7 +8752,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>3</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>A</string>
Expand Down Expand Up @@ -8799,7 +8799,7 @@ LOG</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>1</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Y</string>
Expand Down Expand Up @@ -8889,7 +8889,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>2</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Z</string>
Expand Down Expand Up @@ -8936,7 +8936,7 @@ LOG</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>0</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>X</string>
Expand Down Expand Up @@ -9016,7 +9016,7 @@ LOG</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>0</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>X</string>
Expand Down Expand Up @@ -9099,7 +9099,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>3</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>A</string>
Expand Down Expand Up @@ -9137,7 +9137,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>2</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Z</string>
Expand Down Expand Up @@ -9178,7 +9178,7 @@ LOG</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>1</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Y</string>
Expand Down Expand Up @@ -9271,7 +9271,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>5</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>C</string>
Expand Down Expand Up @@ -9311,7 +9311,7 @@ LOG</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>5</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>C</string>
Expand Down Expand Up @@ -17416,7 +17416,7 @@ ZERO</string>
<number>2</number>
</property>
<property name="text">
<string>10:42:51 PM</string>
<string>09:50:49 PM</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
22 changes: 11 additions & 11 deletions share/qtvcp/screens/qtdragon_hd/qtdragon_hd.ui
View file
Expand Up @@ -15069,7 +15069,7 @@ ZERO</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>1</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Y</string>
Expand Down Expand Up @@ -15149,7 +15149,7 @@ ZERO</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>1</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Y</string>
Expand Down Expand Up @@ -15229,7 +15229,7 @@ ZERO</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>0</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>X</string>
Expand Down Expand Up @@ -15306,7 +15306,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>2</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Z</string>
Expand Down Expand Up @@ -15353,7 +15353,7 @@ ZERO</string>
<bool>false</bool>
</property>
<property name="joint_number" stdset="0">
<number>0</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>X</string>
Expand Down Expand Up @@ -15430,7 +15430,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>2</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>Z</string>
Expand Down Expand Up @@ -15464,7 +15464,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>5</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>C</string>
Expand Down Expand Up @@ -15504,7 +15504,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>5</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>C</string>
Expand Down Expand Up @@ -15541,7 +15541,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>3</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>A</string>
Expand Down Expand Up @@ -15578,7 +15578,7 @@ ZERO</string>
<bool>true</bool>
</property>
<property name="joint_number" stdset="0">
<number>3</number>
<number>-1</number>
</property>
<property name="axis_letter" stdset="0">
<string>A</string>
Expand Down Expand Up @@ -16859,7 +16859,7 @@ ANGULAR</string>
<number>2</number>
</property>
<property name="text">
<string>06:05:42 PM</string>
<string>09:51:41 PM</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down

0 comments on commit cf8cfc1

Please sign in to comment.