fix errors in tool selection

This commit is contained in:
Kamil Sopko 2016-04-09 12:48:32 +02:00
parent 5bd6432ead
commit 4c20040fbe
1 changed files with 2 additions and 2 deletions

View File

@ -2777,7 +2777,7 @@ class CNCjob(Geometry):
# so we actually are sorting the tools by diameter
sorted_tools = sorted(exobj.tools.items(), key = lambda x: x[1])
if tools == "all":
tools = str([i[0] for i in sorted_tools]) # we get a string of ordered tools
tools = [i[0] for i in sorted_tools] # we get a array 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 ','
@ -2819,7 +2819,7 @@ class CNCjob(Geometry):
for tool in tools:
# only if tool have some points, otherwise thre may be error and this part is useless
if "tool" in points:
if tool in points:
# Tool change sequence (optional)
if toolchange:
gcode += "G00 Z%.4f\n" % toolchangez