- fixed the Tcl Command Delete to have an argument -f that will force deletion evading the popup (if the popup is enabled). The sme command without a name now will delete all objects
- fixed the Tcl Command JoinExcellons - fixed the Tcl Command JoinGeometry - fixed the Tcl Command Mirror - updated the Tcl Command Mirror to use a (X,Y) origin parameter. Works if the -box parameter is not used. - updated the Tcl Command Offset. Now it can use only -x or -y parameter no longer is mandatory to have both. The one that is not present will be assumed 0.0 - updated the Tcl Command Panelize. The -rows and -columns parameters are no longer both required. If one is not present then it is assumed to be zero. - updated the Tcl Command Scale. THe -origin parameter can now be a tuple of (x,y) coordinates. - updated the Tcl Command Skew. Now it can use only -x or -y parameter no longer is mandatory to have both. The one that is not present will be assumed 0.0 - updated the help for all the Tcl Commands
This commit is contained in:
@@ -22,7 +22,6 @@ class TclCommandJoinExcellon(TclCommand):
|
||||
|
||||
# Dictionary of types from Tcl command, needs to be ordered , this is for options like -optionname value
|
||||
option_types = collections.OrderedDict([
|
||||
|
||||
])
|
||||
|
||||
# array of mandatory options for current Tcl command: required = {'name','outname'}
|
||||
@@ -30,14 +29,14 @@ class TclCommandJoinExcellon(TclCommand):
|
||||
|
||||
# structured help for current command, args needs to be ordered
|
||||
help = {
|
||||
'main': "Runs a merge operation (join) on the Excellon objects.",
|
||||
'main': "Runs a merge operation (join) on the Excellon objects.\n"
|
||||
"The names of the Excellon objects to be merged will be entered after the outname,\n"
|
||||
"separated by spaces. See the example bellow.\n"
|
||||
"WARNING: if the name of an Excellon objects has spaces, enclose the name with quotes.",
|
||||
'args': collections.OrderedDict([
|
||||
('name', 'Name of the new Excellon Object.'),
|
||||
('obj_name_0', 'Name of the first object'),
|
||||
('obj_name_1', 'Name of the second object.'),
|
||||
('obj_name_2...', 'Additional object names')
|
||||
('outname', 'Name of the new Excellon Object made by joining of other Excellon objects. Required'),
|
||||
]),
|
||||
'examples': []
|
||||
'examples': ['join_excellons merged_new_excellon exc_name_1 "exc name_2"']
|
||||
}
|
||||
|
||||
def execute(self, args, unnamed_args):
|
||||
@@ -48,7 +47,7 @@ class TclCommandJoinExcellon(TclCommand):
|
||||
:return:
|
||||
"""
|
||||
|
||||
outname = args['name']
|
||||
outname = args['outname']
|
||||
obj_names = unnamed_args
|
||||
|
||||
objs = []
|
||||
@@ -60,7 +59,9 @@ class TclCommandJoinExcellon(TclCommand):
|
||||
objs.append(obj)
|
||||
|
||||
def initialize(obj_, app):
|
||||
FlatCAMExcellon.merge(objs, obj_)
|
||||
FlatCAMExcellon.merge(self, objs, obj_)
|
||||
|
||||
if objs is not None:
|
||||
if objs:
|
||||
self.app.new_object("excellon", outname, initialize, plot=False)
|
||||
else:
|
||||
return "No Excellon objects to be joined."
|
||||
|
||||
Reference in New Issue
Block a user