3b9767cc6f
- I had to play with module imports as they created a lot of error in the tests although in reality the program worked OK. - I've fixed some mistakes in TcL commands (they were testing isinstance against the like of Geometry instead of FlatCAMGeometry) - I've had to add some fixes in ObjectCollections.py (error on create_index() method but Marco already fixed this in the checkbox in project tab pull request and knew about this. - Although at some point the tests run fine, I've made some checkings on my own over the Tcl commands and discovered errors which I fixed as mentioned above. - conclusion is that tests are just a must and do not cover everything (like saving projects which at some point by juggling with imports I braked and tests were 100% OK)
64 lines
1.8 KiB
Python
64 lines
1.8 KiB
Python
from tclCommands.TclCommand import *
|
|
|
|
|
|
class TclCommandJoinGeometry(TclCommand):
|
|
"""
|
|
Tcl shell command to merge Excellon objects.
|
|
|
|
example:
|
|
|
|
"""
|
|
|
|
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
|
|
aliases = ['join_geometries', 'join_geometry']
|
|
|
|
# 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([
|
|
|
|
])
|
|
|
|
# array of mandatory options for current Tcl command: required = {'name','outname'}
|
|
required = ['outname']
|
|
|
|
# structured help for current command, args needs to be ordered
|
|
help = {
|
|
'main': "Runs a merge operation (join) on the Excellon objects.",
|
|
'args': collections.OrderedDict([
|
|
('outname', 'Name of the new Geometry Object.'),
|
|
('obj_name_0', 'Name of the first object'),
|
|
('obj_name_1', 'Name of the second object.'),
|
|
('obj_name_2...', 'Additional object names')
|
|
]),
|
|
'examples': []
|
|
}
|
|
|
|
def execute(self, args, unnamed_args):
|
|
"""
|
|
|
|
:param args:
|
|
:param unnamed_args:
|
|
:return:
|
|
"""
|
|
|
|
outname = args['outname']
|
|
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)
|
|
|
|
def initialize(obj_, app):
|
|
FlatCAMGeometry.merge(objs, obj_)
|
|
|
|
if objs is not None:
|
|
self.app.new_object("geometry", outname, initialize)
|