qtplasmac: add translation for tool type

Author: snowgoer540

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '237.306'
+VERSION = '237.307'
 LCNCVER = '2.9'
 DOCSVER = LCNCVER
 
@@ -322,6 +322,11 @@ def __init__(self, halcomp, widgets, paths):
         # jog stack indexes
         self.JOG = 0
         self.CUT_RECOVERY = 1
+        # tool indexes
+        self.TORCH = 0
+        self.SCRIBE = 1
+        self.UNKNOWN = 2
+        self.tool = self.TORCH
 
 # called by qtvcp.py
     def initialized__(self):
@@ -1707,11 +1712,17 @@ def override_jog_changed(self, state):
 
     def tool_changed(self, obj, tool):
         if tool == 0:
-            self.w.lbl_tool.setText('TORCH')
+            self.tool = self.TORCH
+            text = _translate('HandlerClass', 'TORCH')
+            self.w.lbl_tool.setText(text)
         elif tool == 1:
-            self.w.lbl_tool.setText('SCRIBE')
+            self.tool = self.SCRIBE
+            text = _translate('HandlerClass', 'SCRIBE')
+            self.w.lbl_tool.setText(text)
         else:
-            self.w.lbl_tool.setText('UNKNOWN')
+            self.tool = self.UNKNOWN
+            text = _translate('HandlerClass', 'UNKNOWN')
+            self.w.lbl_tool.setText(text)
 
     def gcodes_changed(self, obj, cod):
         if self.units == 'in' and STATUS.is_metric_mode():
@@ -2143,7 +2154,7 @@ def file_clear_clicked(self):
                 self.remove_temp_materials()
                 ACTION.OPEN_PROGRAM(clearFile)
                 ACTION.prefilter_path = self.preClearFile
-                if self.w.lbl_tool.text() != 'TORCH' and STATUS.is_on_and_idle() and STATUS.is_all_homed():
+                if self.tool != self.TORCH and STATUS.is_on_and_idle() and STATUS.is_all_homed():
                     ACTION.CALL_MDI_WAIT('T0 M6')
                     ACTION.CALL_MDI_WAIT('G43 H0')
                     ACTION.SET_MANUAL_MODE()

share/qtvcp/screens/qtplasmac/versions.html

@@ -26,7 +26,12 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.9</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
-<br><b><u>237.305 2024 Feb 25</u></b>
+<br><b><u>237.307 2024 Feb 25</u></b>
+<ul style="margin:0;">
+  <li>add translation for tool type</li>
+</ul>
+
+<br><b><u>237.306 2024 Feb 25</u></b>
 <ul style="margin:0;">
   <li>fix gcode filter spotting coordinates when overburn is active</li>
 </ul>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

@@ -934,7 +934,7 @@ def fix_overburn_incremental_coordinates(self, data):
             x = self.get_axis_value(data, 'X')
             if x is not None:
                 newData += f'X{x - self.oBurnX:0.4f}'
-            y = self.get_axis_value(data, 'y')
+            y = self.get_axis_value(data, 'Y')
             if y is not None:
                 newData += f'Y{y - self.oBurnY:0.4f}'
             return newData