- fixed the Tcl Commands: new_geometry, new_gerber and new_excellon to create correct objects. New Geometry object created with the new_geometry Tcl command accept now the usage of add_circle/polygon/polyline/rectangle Tcl commands
- updated the autocompleter list for the Tcl commands with missing Tcl commands names - added three new Tcl Commands: add_aperture (adds an aperture to a Gerber object), add_drill and add_slot (add a drill/slot to an Excellon object)
This commit is contained in:
136
tclCommands/TclCommandAddSlot.py
Normal file
136
tclCommands/TclCommandAddSlot.py
Normal file
@@ -0,0 +1,136 @@
|
||||
from tclCommands.TclCommand import *
|
||||
from copy import deepcopy
|
||||
from shapely.geometry import Point
|
||||
|
||||
|
||||
class TclCommandAddSlot(TclCommandSignaled):
|
||||
"""
|
||||
Tcl shell command to add a rectange to the given Geometry object.
|
||||
"""
|
||||
|
||||
# array of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
|
||||
aliases = ['add_slot']
|
||||
|
||||
description = '%s %s' % ("--", "Adds a slot in the given Excellon object, if it does not exist already.")
|
||||
|
||||
# Dictionary of types from Tcl command, needs to be ordered.
|
||||
# For positional arguments
|
||||
arg_names = collections.OrderedDict([
|
||||
('name', str)
|
||||
])
|
||||
|
||||
# Dictionary of types from Tcl command, needs to be ordered.
|
||||
# For options like -optionname value
|
||||
option_types = collections.OrderedDict([
|
||||
('dia', float),
|
||||
('startx', float),
|
||||
('starty', float),
|
||||
('stopx', float),
|
||||
('stopy', float),
|
||||
])
|
||||
|
||||
# array of mandatory options for current Tcl command: required = {'name','outname'}
|
||||
required = ['name']
|
||||
|
||||
# structured help for current command, args needs to be ordered
|
||||
help = {
|
||||
'main': "Adds a slot hole in the given Excellon object.",
|
||||
'args': collections.OrderedDict([
|
||||
('name', 'Name of the Excellon object in which to add the slot.'),
|
||||
('dia', 'The tool diameter. Required.'),
|
||||
('startx', "The X coordinate for the slot start point. Required."),
|
||||
('starty', "The Y coordinate for the slot stop point. Required."),
|
||||
('stopx', "The X coordinate for the slot start point. Required."),
|
||||
('stopy', "The Y coordinate for the slot stop point. Required."),
|
||||
]),
|
||||
'examples': ["add_slot excellon_name -dia 0.8 -startx 1 -starty 1 -stopx 1.3 -stopy 1"]
|
||||
}
|
||||
|
||||
def execute(self, args, unnamed_args):
|
||||
"""
|
||||
execute current TCL shell command
|
||||
|
||||
:param args: array of known named arguments and options
|
||||
:param unnamed_args: array of other values which were passed into command
|
||||
without -somename and we do not have them in known arg_names
|
||||
:return: None or exception
|
||||
"""
|
||||
|
||||
if unnamed_args:
|
||||
self.raise_tcl_error(
|
||||
"Too many arguments. Correct format: %s" %
|
||||
'["add_drill excellon_name -dia -x -y"]')
|
||||
|
||||
name = args['name']
|
||||
try:
|
||||
obj = self.app.collection.get_by_name(str(name))
|
||||
except Exception:
|
||||
return "Could not retrieve object: %s" % name
|
||||
if obj is None:
|
||||
return "Object not found: %s" % name
|
||||
if obj.kind != 'excellon':
|
||||
return 'Expected Excellon, got %s %s.' % (name, type(obj))
|
||||
|
||||
if 'dia' not in args:
|
||||
return "Failed. The -dia parameter is missing and it is required."
|
||||
if 'startx' not in args:
|
||||
return "Failed. The -startx parameter is missing and it is required."
|
||||
if 'starty' not in args:
|
||||
return "Failed. The -starty parameter is missing and it is required."
|
||||
if 'stopx' not in args:
|
||||
return "Failed. The -stopx parameter is missing and it is required."
|
||||
if 'stopy' not in args:
|
||||
return "Failed. The -stopy parameter is missing and it is required."
|
||||
|
||||
new_dia = args['dia']
|
||||
slot_start_x = args['startx']
|
||||
slot_start_y = args['starty']
|
||||
slot_stop_x = args['stopx']
|
||||
slot_stop_y = args['stopy']
|
||||
|
||||
dia_tool_dict = {diam['tooldia']: tool for tool, diam in list(obj.tools.items())}
|
||||
|
||||
new_data = {}
|
||||
kind = 'excellon'
|
||||
for option in self.app.options:
|
||||
if option.find(kind + "_") == 0:
|
||||
oname = option[len(kind) + 1:]
|
||||
new_data[oname] = self.app.options[option]
|
||||
|
||||
if option.find('tools_drill_') == 0:
|
||||
new_data[option] = self.app.options[option]
|
||||
|
||||
new_slot = (
|
||||
Point(slot_start_x, slot_start_y),
|
||||
Point(slot_stop_x, slot_stop_y)
|
||||
)
|
||||
|
||||
if not dia_tool_dict:
|
||||
obj.tools[1] = {
|
||||
'tooldia': new_dia,
|
||||
'drills': [],
|
||||
'slots': [new_slot],
|
||||
'data': deepcopy(new_data)
|
||||
}
|
||||
elif new_dia not in list(dia_tool_dict.keys()):
|
||||
new_tool = max(list(obj.tools.keys())) + 1
|
||||
obj.tools[new_tool] = {
|
||||
'tooldia': new_dia,
|
||||
'drills': [],
|
||||
'slots': [new_slot],
|
||||
'data': deepcopy(new_data)
|
||||
}
|
||||
|
||||
# sort the updated tools dict
|
||||
new_tools = {}
|
||||
tools_sorted = sorted(obj.tools.items(), key=lambda x: x[1]['tooldia'])
|
||||
for idx, tool in enumerate(tools_sorted, start=1):
|
||||
new_tools[idx] = tool[1]
|
||||
obj.tools = deepcopy(new_tools)
|
||||
elif new_dia in list(dia_tool_dict.keys()):
|
||||
if new_slot not in obj.tools[dia_tool_dict[new_dia]]['slots']:
|
||||
obj.tools[dia_tool_dict[new_dia]]['slots'].append(new_slot)
|
||||
else:
|
||||
return "Slot with the given coordinates is already in the object."
|
||||
|
||||
obj.create_geometry()
|
||||
Reference in New Issue
Block a user