- working to differentiate between temporary units change and permanent units change

appPlugins/ToolPaint.py

@@ -281,7 +281,7 @@ class ToolPaint(AppTool, Gerber):
         self.reset_fields()
 
         # updated units
-        self.units = self.app.defaults['units'].upper()
+        self.units = self.app.app_units.upper()
 
         # set the working variables to a known state
         self.paint_tools.clear()
@@ -726,7 +726,7 @@ class ToolPaint(AppTool, Gerber):
         self.ui_disconnect()
 
         # updated units
-        self.units = self.app.defaults['units'].upper()
+        self.units = self.app.app_units.upper()
 
         sorted_tools = []
         for k, v in self.paint_tools.items():
@@ -962,7 +962,7 @@ class ToolPaint(AppTool, Gerber):
 
     def on_tool_default_add(self, dia=None, muted=None):
         self.blockSignals(True)
-        self.units = self.app.defaults['units'].upper()
+        self.units = self.app.app_units.upper()
 
         if dia:
             tool_dia = dia
@@ -1495,7 +1495,7 @@ class ToolPaint(AppTool, Gerber):
         #                                        "%.4f    " % (self.app.dx, self.app.dy))
         self.app.ui.update_location_labels(self.app.dx, self.app.dy, curr_pos[0], curr_pos[1])
 
-        units = self.app.defaults["units"].lower()
+        units = self.app.app_units.lower()
         # self.app.plotcanvas.text_hud.text = \
         #     'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX:  \t{:<.4f} [{:s}]\nY:  \t{:<.4f} [{:s}]'.format(
         #         self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
@@ -2807,7 +2807,7 @@ class ToolPaint(AppTool, Gerber):
         """
 
         self.ui_disconnect()
-        self.units = self.app.defaults['units'].upper()
+        self.units = self.app.app_units.upper()
 
         tooldia = float(tool['tooldia'])