- more refactoring; solved some issues introduced by the refactoring

AppObjects/AppObject.py

@@ -292,7 +292,7 @@ class AppObject(QtCore.QObject):
         self.app.collection.append(obj)
 
         # after adding the object to the collection always update the list of objects that are in the collection
-        self.all_objects_list = self.app.collection.get_list()
+        self.app.all_objects_list = self.app.collection.get_list()
 
         # self.app.inform.emit('[selected] %s created & selected: %s' %
         #                  (str(obj.kind).capitalize(), str(obj.options['name'])))
@@ -358,7 +358,7 @@ class AppObject(QtCore.QObject):
         # Send to worker
         # self.worker.add_task(worker_task, [self])
         if plot is True:
-            self.worker_task.emit({'fcn': task, 'params': [obj]})
+            self.app.worker_task.emit({'fcn': task, 'params': [obj]})
 
     def on_object_changed(self, obj):
         """
@@ -390,4 +390,4 @@ class AppObject(QtCore.QObject):
 
         :return: None
         """
-        self.app.on_zoom_fit(None)
+        self.app.on_zoom_fit()

AppObjects/FlatCAMExcellon.py

@@ -146,7 +146,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
 
         If only one object is in exc_list parameter then this function will copy that object in the exc_final
 
-        :param exc_list: List or one object of ExcellonObject AppObjects to join.
+        :param exc_list: List or one object of ExcellonObject Objects to join.
         :param exc_final: Destination ExcellonObject object.
         :return: None
         """

AppObjects/FlatCAMGeometry.py

@@ -2738,7 +2738,7 @@ class GeometryObject(FlatCAMObj, Geometry):
         """
         Merges the geometry of objects in grb_list into the geometry of geo_final.
 
-        :param geo_list: List of GerberObject AppObjects to join.
+        :param geo_list: List of GerberObject Objects to join.
         :param geo_final: Destination GerberObject object.
         :param multigeo: if the merged geometry objects are of type MultiGeo
         :return: None

AppObjects/FlatCAMGerber.py

@@ -45,7 +45,7 @@ class GerberObject(FlatCAMObj, Gerber):
         Merges the geometry of objects in geo_list into
         the geometry of geo_final.
 
-        :param grb_list: List of GerberObject AppObjects to join.
+        :param grb_list: List of GerberObject Objects to join.
         :param grb_final: Destination GeometryObject object.
         :return: None
         """

AppObjects/ObjectCollection.py

@@ -1010,7 +1010,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
 
     def on_row_selected(self, obj_name):
         """
-        This is a special string; when received it will make all Menu -> AppObjects entries unchecked
+        This is a special string; when received it will make all Menu -> Objects entries unchecked
         It mean we clicked outside of the items and deselected all
 
         :param obj_name:
@@ -1194,6 +1194,6 @@ class ObjectCollection(QtCore.QAbstractItemModel):
                     pass
 
             if obj_list:
-                self.app.inform.emit('%s' % _("AppObjects selection is cleared."))
+                self.app.inform.emit('%s' % _("Objects selection is cleared."))
             else:
                 self.app.inform.emit('')