From bc4411d56609ac544e967495083404ecec13a67f Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 27 May 2018 12:07:57 +0300 Subject: [PATCH] - added a new column in the TableTool where I show the number of drill holes for each tool. --- FlatCAMObj.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index f37ff471..12038e1b 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -756,18 +756,29 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): # Populate tool list n = len(self.tools) - self.ui.tools_table.setColumnCount(2) - self.ui.tools_table.setHorizontalHeaderLabels(['#', 'Diameter']) + self.ui.tools_table.setColumnCount(3) + self.ui.tools_table.setHorizontalHeaderLabels(['#', 'Diameter', 'Count']) self.ui.tools_table.setRowCount(n) self.ui.tools_table.setSortingEnabled(False) + i = 0 for tool in self.tools: + + drill_cnt = 0 # variable to store the nr of drills per tool + # Find no of drills for the current tool + for drill in self.drills: + if drill.get('tool') == tool: + drill_cnt += 1 + id = QtGui.QTableWidgetItem(tool) id.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.ui.tools_table.setItem(i, 0, id) # Tool name/id dia = QtGui.QTableWidgetItem(str(self.tools[tool]['C'])) dia.setFlags(QtCore.Qt.ItemIsEnabled) + drill_count = QtGui.QTableWidgetItem('%d' % drill_cnt) + drill_count.setFlags(QtCore.Qt.ItemIsEnabled) self.ui.tools_table.setItem(i, 1, dia) # Diameter + self.ui.tools_table.setItem(i, 2, drill_count) # Number of drills per tool i += 1 # sort the tool diameter column @@ -777,7 +788,11 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): self.ui.tools_table.resizeColumnsToContents() self.ui.tools_table.resizeRowsToContents() - self.ui.tools_table.horizontalHeader().setStretchLastSection(True) + horizontal_header = self.ui.tools_table.horizontalHeader() + horizontal_header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents) + horizontal_header.setResizeMode(1, QtGui.QHeaderView.Stretch) + horizontal_header.setResizeMode(2, QtGui.QHeaderView.ResizeToContents) + # horizontal_header.setStretchLastSection(True) self.ui.tools_table.verticalHeader().hide() self.ui.tools_table.setSortingEnabled(True)