Prechádzať zdrojové kódy

Merged in marius_stanciu/flatcam (pull request #22)

Solved issue #188: Order of the drill bits in Gcode generation from Excellon file
jpcgt 10 rokov pred
rodič
commit
57ed36584c
2 zmenil súbory, kde vykonal 7 pridanie a 1 odobranie
  1. 6 0
      FlatCAMObj.py
  2. 1 1
      camlib.py

+ 6 - 0
FlatCAMObj.py

@@ -648,6 +648,12 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
             dia.setFlags(QtCore.Qt.ItemIsEnabled)
             self.ui.tools_table.setItem(i, 1, dia)  # Diameter
             i += 1
+        
+        # sort the tool diameter column
+        self.ui.tools_table.sortItems(1)
+        # all the tools are selected by default
+        self.ui.tools_table.selectColumn(0)
+        
         self.ui.tools_table.resizeColumnsToContents()
         self.ui.tools_table.resizeRowsToContents()
         self.ui.tools_table.horizontalHeader().setStretchLastSection(True)

+ 1 - 1
camlib.py

@@ -2746,7 +2746,7 @@ class CNCjob(Geometry):
 
         gcode += self.pausecode + "\n"
 
-        for tool in points:
+        for tool in tools:
 
             # Tool change sequence (optional)
             if toolchange: