- refactoring names for some classes

appPlugins/ToolDistance.py

@@ -14,7 +14,7 @@ from appGUI.GUIElements import FCEntry, FCButton, FCCheckBox, FCLabel, VerticalS
 from shapely.geometry import Point, MultiLineString, Polygon
 
 import appTranslation as fcTranslate
-from camlib import FlatCAMRTreeStorage
+from camlib import AppRTreeStorage
 from appEditors.AppGeoEditor import DrawToolShape
 
 from copy import copy
@@ -670,7 +670,7 @@ class Distance(AppTool):
     @staticmethod
     def make_storage():
         # ## Shape storage.
-        storage = FlatCAMRTreeStorage()
+        storage = AppRTreeStorage()
         storage.get_points = DrawToolShape.get_pts
 
         return storage

appPlugins/ToolEtchCompensation.py

@@ -272,7 +272,7 @@ class ToolEtchCompensation(AppTool):
             :param new_obj:     New object
             :type new_obj:      ObjectCollection
             :param app_obj:     App
-            :type app_obj:      app_Main.App
+            :type app_obj:      appMain.App
             :return:            None
             :rtype:
             """

appPlugins/ToolLevelling.py

@@ -8,7 +8,7 @@
 from PyQt6 import QtWidgets, QtCore, QtGui
 from PyQt6.QtCore import Qt
 
-from appObjects.FlatCAMObj import ObjectDeleted
+from appObjects.AppObjectTemplate import ObjectDeleted
 from appTool import AppTool
 from appGUI.VisPyVisuals import *
 from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy

appPlugins/ToolMilling.py

@@ -3297,7 +3297,7 @@ class ToolMilling(AppTool, Excellon):
                             # graceful abort requested by the user
                             raise grace
 
-                        # Type(cpoly) == FlatCAMRTreeStorage | None
+                        # Type(cpoly) == AppRTreeStorage | None
                         cpoly = None
                         if paint_method == 0:  # Standard
                             cpoly = self.clear_polygon(bbox,

appPlugins/ToolNCC.py

@@ -2264,7 +2264,7 @@ class NonCopperClear(AppTool, Gerber):
         Clear the excess copper from the entire object.
 
         :param ncc_obj:         ncc cleared object
-        :type ncc_obj:          appObjects.FlatCAMGerber.GerberObject
+        :type ncc_obj:          appObjects.GerberObject.GerberObject
         :param ncctooldia:      a list of diameters of the tools to be used to ncc clear
         :type ncctooldia:       list
         :param isotooldia:      a list of diameters of the tools to be used for isolation

appPlugins/ToolPaint.py

@@ -12,7 +12,7 @@ from appTool import AppTool
 from copy import deepcopy
 
 from appParsers.ParseGerber import Gerber
-from camlib import Geometry, FlatCAMRTreeStorage, grace
+from camlib import Geometry, AppRTreeStorage, grace
 from appGUI.GUIElements import FCTable, FCDoubleSpinner, FCCheckBox, FCInputDoubleSpinner, RadioSet, \
     FCButton, FCComboBox, FCLabel, FCComboBox2, VerticalScrollArea, FCGridLayout, FCFrame
 
@@ -1617,7 +1617,7 @@ class ToolPaint(AppTool, Gerber):
 
         if paint_method == 0:   # _("Standard")
             try:
-                # Type(cp) == FlatCAMRTreeStorage | None
+                # Type(cp) == AppRTreeStorage | None
                 cpoly = self.clear_polygon(polyg,
                                            tooldia=tooldiameter,
                                            steps_per_circle=self.circle_steps,
@@ -1631,7 +1631,7 @@ class ToolPaint(AppTool, Gerber):
                 self.app.log.error("ToolPaint.paint_polygon_worker() Standard --> %s" % str(ee))
         elif paint_method == 1:  # _("Seed")
             try:
-                # Type(cp) == FlatCAMRTreeStorage | None
+                # Type(cp) == AppRTreeStorage | None
                 cpoly = self.clear_polygon2(polyg,
                                             tooldia=tooldiameter,
                                             steps_per_circle=self.circle_steps,
@@ -1645,7 +1645,7 @@ class ToolPaint(AppTool, Gerber):
                 self.app.log.error("ToolPaint.paint_polygon_worker() Seed --> %s" % str(ee))
         elif paint_method == 2:  # _("Lines")
             try:
-                # Type(cp) == FlatCAMRTreeStorage | None
+                # Type(cp) == AppRTreeStorage | None
                 cpoly = self.clear_polygon3(polyg,
                                             tooldia=tooldiameter,
                                             steps_per_circle=self.circle_steps,
@@ -1705,7 +1705,7 @@ class ToolPaint(AppTool, Gerber):
             except Exception as ee:
                 self.app.log.error("ToolPaint.paint_polygon_worker() Laser Lines -> Identify flashes/traces--> %s" % str(ee))
 
-            cpoly = FlatCAMRTreeStorage()
+            cpoly = AppRTreeStorage()
             pads_lines_list = []
 
             # process the flashes found in the selected polygon with the 'lines' method for rectangular

appPlugins/ToolPunchGerber.py

@@ -17,7 +17,7 @@ from shapely.geometry import MultiPolygon, Point
 from shapely.ops import unary_union
 
 from appParsers.ParseGerber import Gerber
-from camlib import Geometry, FlatCAMRTreeStorage, grace
+from camlib import Geometry, AppRTreeStorage, grace
 
 from matplotlib.backend_bases import KeyEvent as mpl_key_event