- 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:
@@ -12,7 +12,7 @@ class TclCommandDelete(TclCommand):
|
||||
"""
|
||||
|
||||
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
|
||||
aliases = ['delete']
|
||||
aliases = ['delete', 'del']
|
||||
|
||||
# Dictionary of types from Tcl command, needs to be ordered
|
||||
arg_names = collections.OrderedDict([
|
||||
@@ -21,19 +21,23 @@ class TclCommandDelete(TclCommand):
|
||||
|
||||
# Dictionary of types from Tcl command, needs to be ordered , this is for options like -optionname value
|
||||
option_types = collections.OrderedDict([
|
||||
|
||||
('f', bool)
|
||||
])
|
||||
|
||||
# array of mandatory options for current Tcl command: required = {'name','outname'}
|
||||
required = ['name']
|
||||
required = []
|
||||
|
||||
# structured help for current command, args needs to be ordered
|
||||
help = {
|
||||
'main': 'Deletes the given object.',
|
||||
'main': 'Deletes the given object. If no name is given will delete all objects.',
|
||||
'args': collections.OrderedDict([
|
||||
('name', 'Name of the Object.'),
|
||||
('f', 'Use this parameter to force deletion.')
|
||||
]),
|
||||
'examples': []
|
||||
'examples': ['del new_geo -f True\n'
|
||||
'delete new_geo -f 1\n'
|
||||
'del new_geo -f\n'
|
||||
'del new_geo']
|
||||
}
|
||||
|
||||
def execute(self, args, unnamed_args):
|
||||
@@ -43,13 +47,35 @@ class TclCommandDelete(TclCommand):
|
||||
:param unnamed_args:
|
||||
:return:
|
||||
"""
|
||||
|
||||
obj_name = args['name']
|
||||
obj_name = None
|
||||
|
||||
try:
|
||||
# deselect all to avoid delete selected object when run delete from shell
|
||||
self.app.collection.set_all_inactive()
|
||||
self.app.collection.set_active(str(obj_name))
|
||||
self.app.on_delete() # Todo: This is an event handler for the GUI... bad?
|
||||
except Exception as e:
|
||||
return "Command failed: %s" % str(e)
|
||||
obj_name = args['name']
|
||||
delete_all = False
|
||||
except KeyError:
|
||||
delete_all = True
|
||||
|
||||
is_forced = False
|
||||
if 'f' in args:
|
||||
try:
|
||||
if args['f'] is None:
|
||||
is_forced = True
|
||||
else:
|
||||
is_forced = True if eval(str(args['f'])) else False
|
||||
except KeyError:
|
||||
is_forced = True
|
||||
|
||||
if delete_all is False:
|
||||
try:
|
||||
# deselect all to avoid delete selected object when run delete from shell
|
||||
self.app.collection.set_all_inactive()
|
||||
self.app.collection.set_active(str(obj_name))
|
||||
self.app.on_delete(force_deletion=is_forced)
|
||||
except Exception as e:
|
||||
return "Command failed: %s" % str(e)
|
||||
else:
|
||||
try:
|
||||
self.app.collection.set_all_active()
|
||||
self.app.on_delete(force_deletion=is_forced)
|
||||
except Exception as e:
|
||||
return "Command failed: %s" % str(e)
|
||||
|
||||
Reference in New Issue
Block a user