- maintenance_2

This commit is contained in:
Marius Stanciu
2020-06-02 18:29:45 +03:00
committed by Marius
parent 38fa25ed3d
commit f5c84fdc49
255 changed files with 162378 additions and 152106 deletions

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from flatcamObjects.FlatCAMExcellon import ExcellonObject
from AppObjects.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.new_object("excellon", outname, initialize, plot=False)
self.app.app_obj.new_object("excellon", outname, initialize, plot=False)
else:
return "No Excellon objects to be joined or less than two Excellon objects specified for merging."