Kaynağa Gözat

fix errors in tool selection

Kamil Sopko 9 yıl önce
ebeveyn
işleme
4c20040fbe
1 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 2 2
      camlib.py

+ 2 - 2
camlib.py

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