|
|
@@ -2711,16 +2711,16 @@ class CNCjob(Geometry):
|
|
|
|
|
|
# Tools
|
|
|
|
|
|
- #sort the tools list by the second item in tuple (here we have a dict with diameter of the tool)
|
|
|
- #so we actually are sorting the tools by diameter
|
|
|
+ # sort the tools list by the second item in tuple (here we have a dict with diameter of the tool)
|
|
|
+ # so we actually are sorting the tools by diameter
|
|
|
sorted_tools = sorted(exobj.tools.items(), key = operator.itemgetter(1))
|
|
|
if tools == "all":
|
|
|
- tools = str([i[0] for i in sorted_tools]) #we get a string of ordered tools
|
|
|
+ tools = str([i[0] for i in sorted_tools]) # we get a string of ordered tools
|
|
|
log.debug("Tools 'all' and sorted are: %s" % str(tools))
|
|
|
else:
|
|
|
- selected_tools = [x.strip() for x in tools.split(",")] #we strip spaces and also separate the tools by ','
|
|
|
+ selected_tools = [x.strip() for x in tools.split(",")] # we strip spaces and also separate the tools by ','
|
|
|
selected_tools = filter(lambda i: i in selected_tools, selected_tools)
|
|
|
- tools = [i for i,j in sorted_tools for k in selected_tools if i == k] #create a sorted list of selected tools from the sorted_tools list
|
|
|
+ tools = [i for i,j in sorted_tools for k in selected_tools if i == k] # create a sorted list of selected tools from the sorted_tools list
|
|
|
log.debug("Tools selected and sorted are: %s" % str(tools))
|
|
|
|
|
|
# Points (Group by tool)
|