42949021b1
- 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
69 lines
2.1 KiB
Python
69 lines
2.1 KiB
Python
from tclCommands.TclCommand import TclCommand
|
|
from FlatCAMObj import FlatCAMGeometry
|
|
|
|
import collections
|
|
|
|
|
|
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 Geometry objects.\n"
|
|
"The names of the Geometry 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 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'),
|
|
]),
|
|
'examples': ['join_geometry merged_new_geo geo_name_1 "geo name_2"']
|
|
}
|
|
|
|
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(self, objs, obj_)
|
|
|
|
if objs:
|
|
self.app.new_object("geometry", outname, initialize, plot=False)
|
|
else:
|
|
return "No Geometry objects to be joined."
|