- maintenance_1

2020-06-02 18:24:44 +03:00
parent 7f06677791
commit 5abb7866d8
255 changed files with 152017 additions and 162289 deletions
--- a/tclCommands/TclCommandJoinGeometry.py
+++ b/tclCommands/TclCommandJoinGeometry.py
@@ -1,5 +1,5 @@
 from tclCommands.TclCommand import TclCommand
-from AppObjects.FlatCAMGeometry import GeometryObject
+from flatcamObjects.FlatCAMGeometry import GeometryObject

 import collections

@@ -65,6 +65,6 @@ class TclCommandJoinGeometry(TclCommand):
            GeometryObject.merge(objs, obj_)

        if objs and len(objs) >= 2:
-            self.app.app_obj.new_object("geometry", outname, initialize, plot=False)
+            self.app.new_object("geometry", outname, initialize, plot=False)
        else:
            return "No Geometry objects to be joined or less than two Geometry objects specified for merging."