bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated the join_geometry and join_excellon Tcl commands format to follow the format of other commands

Browse Source
This commit is contained in:
Marius Stanciu
2022-01-31 20:39:30 +02:00
committed by Marius
parent b64c11885a
commit 7306e7ada1
6 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tclCommands/TclCommandJoinExcellon.py
View File

@@ -20,26 +20,29 @@ class TclCommandJoinExcellon(TclCommand):
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
('outname', str),
])
# Dictionary of types from Tcl command, needs to be ordered , this is for options like -optionname value
option_types = collections.OrderedDict([
('outname', str),
])
# array of mandatory options for current Tcl command: required = {'name','outname'}
required = ['outname']
required = []
# structured help for current command, args needs to be ordered
help = {
'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"
"The names of the Excellon objects to be merged will be entered after the command,\n"
"separated by spaces. See the example below.\n"
"WARNING: if the name of an Excellon objects has spaces, enclose the name with quotes.",
'args': collections.OrderedDict([
('outname', 'Name of the new Excellon Object made by joining of other Excellon objects. Required'),
('outname', 'Name of the new Excellon Object made by joining of other Excellon objects.\n'
'If not used then it will be used a generic name: "joined_exc"'),
]),
'examples': ['join_excellons merged_new_excellon exc_name_1 "exc name_2"']
'examples': ['join_excellons exc_name_1 "exc name_2" -outname merged_new_excellon',
'join_excellon exc_name_1 "exc name_2"']
}
def execute(self, args, unnamed_args):
@@ -49,22 +52,26 @@ class TclCommandJoinExcellon(TclCommand):
:param unnamed_args:
:return:
"""
self.app.log.debug("TclCommandJoinExcellon.execute()")
outname = args['outname']
outname = args['outname'] if 'outname' in args else "joined_exc"
obj_names = unnamed_args
objs = []
for obj_n in obj_names:
obj = self.app.collection.get_by_name(str(obj_n))
if obj is None:
return "Object not found: %s" % obj_n
self.app.log.error("Object not found: %s" % obj_n)
return "fail"
else:
objs.append(obj)
def initialize(obj_, app):
ExcellonObject.merge(objs, obj_, decimals=self.app.decimals)
ExcellonObject.merge(objs, obj_, decimals=self.app.decimals, log=app.log)
if objs and len(objs) >= 2:
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."
self.app.log.error(
"No Excellon objects to be joined or less than two Excellon objects specified for merging.")
return "fail"

29
tclCommands/TclCommandJoinGeometry.py
View File

@@ -19,27 +19,27 @@ class TclCommandJoinGeometry(TclCommand):
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
('outname', str),
])
# Dictionary of types from Tcl command, needs to be ordered , this is for options like -optionname value
option_types = collections.OrderedDict([
('outname', str)
])
# array of mandatory options for current Tcl command: required = {'name','outname'}
required = ['outname']
required = []
# structured help for current command, args needs to be ordered
help = {
'main': "Runs a merge operation (join) on the Geometry objects.\n"
"The names of the Geometry objects to be merged will be entered after the outname,\n"
"The names of the Geometry objects to be merged will be entered after the command,\n"
"separated by spaces. See the example below.\n"
"WARNING: if the name of an Geometry objects has spaces, enclose the name with quotes.",
'args': collections.OrderedDict([
('outname', 'Name of the new Geometry Object made by joining of other Geometry objects. Required'),
('outname', 'Name of the new Geometry Object made by joining of other Geometry objects.\n'
'If no outname is provided then will be used a generic "joined_geo" name.'),
]),
'examples': ['join_geometry merged_new_geo geo_name_1 "geo name_2"']
'examples': ['join_geometry geo_name_1 "geo name_2" -outname merged_new_geo']
}
def execute(self, args, unnamed_args):
@@ -49,22 +49,25 @@ class TclCommandJoinGeometry(TclCommand):
:param unnamed_args:
:return:
"""
self.app.log.debug("TclCommandJoinGeometry.execute()")
outname = args['outname']
outname = args['outname'] if 'outname' in args else "joined_geo"
obj_names = unnamed_args
objs = []
for obj_n in obj_names:
obj = self.app.collection.get_by_name(str(obj_n))
if obj is None:
return "Object not found: %s" % obj_n
else:
objs.append(obj)
if obj is None or obj == '':
self.app.log.error("Object not found: %s" % obj_n)
return "fail"
objs.append(obj)
def initialize(obj_, app):
GeometryObject.merge(objs, obj_)
GeometryObject.merge(objs, obj_, log=app.log)
if objs and len(objs) >= 2:
self.app.app_obj.new_object("geometry", outname, initialize, plot=False)
else:
return "No Geometry objects to be joined or less than two Geometry objects specified for merging."
self.app.log.error(
"No Geometry objects to be joined or less than two Geometry objects specified for merging.")
return "fail"