qtplasmac: use gcode units for bounds check and table view conversions

Author: snowgoer540

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.235.268'
+VERSION = '1.235.269'
 
 '''
 qtplasmac_handler.py
@@ -1967,9 +1967,9 @@ def view_t_pressed(self):
         mid, size = GlCanonDraw.extents_info(self.w.gcodegraphics)
         if self.gcodeProps:
             mult = 1
-            if self.units == 'in' and self.gcodeProps['machine_unit_sys'] == 'Metric':
+            if self.units == 'in' and self.gcodeProps['gcode_units'] == 'mm':
                 mult = 0.03937
-            elif self.units == 'mm' and self.gcodeProps['machine_unit_sys'] == 'Imperial':
+            elif self.units == 'mm' and self.gcodeProps['gcode_units'] == 'in':
                 mult = 25.4
             x = (round(float(self.gcodeProps['x'].split()[0]) * mult, 4))
             y = (round(float(self.gcodeProps['y'].split()[0]) * mult, 4))
@@ -2432,9 +2432,9 @@ def bounds_check(self, boundsType, xOffset, yOffset):
         self.boundsError[boundsType] = False
         msgList = []
         boundsMultiplier = 1
-        if self.units == 'in' and self.gcodeProps['machine_unit_sys'] == 'Metric':
+        if self.units == 'in' and self.gcodeProps['gcode_units'] == 'mm':
             boundsMultiplier = 0.03937
-        elif self.units == 'mm' and self.gcodeProps['machine_unit_sys'] == 'Imperial':
+        elif self.units == 'mm' and self.gcodeProps['gcode_units'] == 'in':
             boundsMultiplier = 25.4
         if framing:
             xStart = STATUS.stat.g5x_offset[0] + xOffset

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,13 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.235.269 2023 Mar 24</u></b>
+<ul style="margin:0;">
+  <li>remove blank file props workaround</li>
+  <li>use gcode units for bounds check and table view conversions</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.235.268 2023 Mar 15</u></b>
 <ul style="margin:0;">
   <li>fix framing when machine units and g20/g21 state dont match</li>