- maintenance_1

This commit is contained in:
Marius
2020-06-02 18:24:44 +03:00
parent 7f06677791
commit 5abb7866d8
255 changed files with 152017 additions and 162289 deletions

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from AppObjects.FlatCAMExcellon import ExcellonObject
from flatcamObjects.FlatCAMExcellon import ExcellonObject
import collections
@@ -65,6 +65,6 @@ class TclCommandJoinExcellon(TclCommand):
ExcellonObject.merge(objs, obj_, decimals=self.app.decimals)
if objs and len(objs) >= 2:
self.app.app_obj.new_object("excellon", outname, initialize, plot=False)
self.app.new_object("excellon", outname, initialize, plot=False)
else:
return "No Excellon objects to be joined or less than two Excellon objects specified for merging."