- refactoring names for some classes

appObjects/AppObject.py

@@ -8,11 +8,11 @@
 # ###########################################################
 
 from appObjects.ObjectCollection import *
-from appObjects.FlatCAMCNCJob import CNCJobObject
-from appObjects.FlatCAMDocument import DocumentObject
-from appObjects.FlatCAMExcellon import ExcellonObject
-from appObjects.FlatCAMGeometry import GeometryObject
-from appObjects.FlatCAMGerber import GerberObject
+from appObjects.CNCJobObject import CNCJobObject
+from appObjects.DocumentObject import DocumentObject
+from appObjects.ExcellonObject import ExcellonObject
+from appObjects.GeometryObject import GeometryObject
+from appObjects.GerberObject import GerberObject
 from appObjects.FlatCAMScript import ScriptObject
 
 import time

appObjects/CNCJobObject.py

@@ -14,7 +14,7 @@ from io import StringIO
 from datetime import datetime
 
 from appEditors.AppTextEditor import AppTextEditor
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 
 from camlib import CNCjob
 

appObjects/DocumentObject.py

@@ -10,7 +10,7 @@
 # File modified by: Marius Stanciu                         #
 # ##########################################################
 from appEditors.AppTextEditor import AppTextEditor
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 
 import gettext
 import appTranslation as fcTranslate

appObjects/ExcellonObject.py

@@ -14,7 +14,7 @@
 from shapely.geometry import LineString
 
 from appParsers.ParseExcellon import Excellon
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 
 import itertools
 import numpy as np

appObjects/FlatCAMScript.py

@@ -11,7 +11,7 @@
 # ##########################################################
 
 from appEditors.AppTextEditor import AppTextEditor
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 from appGUI.ObjectUI import *
 
 import gettext

appObjects/GeometryObject.py

@@ -15,7 +15,7 @@ import shapely.affinity as affinity
 
 from camlib import Geometry, flatten_shapely_geometry
 
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 
 import ezdxf
 import numpy as np

appObjects/GerberObject.py

@@ -15,7 +15,7 @@ from shapely.geometry import MultiLineString, LinearRing
 from camlib import flatten_shapely_geometry
 
 from appParsers.ParseGerber import Gerber
-from appObjects.FlatCAMObj import *
+from appObjects.AppObjectTemplate import *
 
 import numpy as np
 from copy import deepcopy

appObjects/ObjectCollection.py

@@ -16,12 +16,12 @@ from PyQt6.QtCore import Qt, QSettings
 from PyQt6.QtGui import QColor
 # from PyQt6.QtCore import QModelIndex
 
-from appObjects.FlatCAMObj import FlatCAMObj
-from appObjects.FlatCAMCNCJob import CNCJobObject
-from appObjects.FlatCAMDocument import DocumentObject
-from appObjects.FlatCAMExcellon import ExcellonObject
-from appObjects.FlatCAMGeometry import GeometryObject
-from appObjects.FlatCAMGerber import GerberObject
+from appObjects.AppObjectTemplate import FlatCAMObj
+from appObjects.CNCJobObject import CNCJobObject
+from appObjects.DocumentObject import DocumentObject
+from appObjects.ExcellonObject import ExcellonObject
+from appObjects.GeometryObject import GeometryObject
+from appObjects.GerberObject import GerberObject
 from appObjects.FlatCAMScript import ScriptObject
 
 import inspect  # TODO: Remove