Merged in marius_stanciu/flatcam (pull request #22)

Solved issue #188: Order of the drill bits in Gcode generation from Excellon file
2016-02-14 18:00:40 -05:00
parent 2bf78920ae a7b29065df
commit 57ed36584c
2 changed files with 7 additions and 1 deletions
--- a/FlatCAMObj.py
+++ b/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)
--- a/camlib.py
+++ b/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: