From b9fa2e2bfded3f582546e30e497f6bfe5c348a1b Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 7 May 2019 15:24:20 +0300 Subject: [PATCH] - fixed the Gerber Object and Gerber Editor Apertures Table to not show extra rows when there are aperture macros in the object --- FlatCAMObj.py | 55 +++++++++++++++--------------- README.md | 1 + flatcamEditors/FlatCAMGrbEditor.py | 49 +++++++++++++------------- 3 files changed, 54 insertions(+), 51 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 7733cf3e..8e770ecd 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -585,12 +585,13 @@ class FlatCAMGerber(FlatCAMObj, Gerber): sort.append(int(k)) sorted_apertures = sorted(sort) - sort = [] - for k, v in list(self.aperture_macros.items()): - sort.append(k) - sorted_macros = sorted(sort) + # sort = [] + # for k, v in list(self.aperture_macros.items()): + # sort.append(k) + # sorted_macros = sorted(sort) - n = len(sorted_apertures) + len(sorted_macros) + # n = len(sorted_apertures) + len(sorted_macros) + n = len(sorted_apertures) self.ui.apertures_table.setRowCount(n) for ap_code in sorted_apertures: @@ -648,28 +649,28 @@ class FlatCAMGerber(FlatCAMObj, Gerber): self.apertures_row += 1 - for ap_code in sorted_macros: - ap_code = str(ap_code) - - ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) - ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) - self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id - - ap_code_item = QtWidgets.QTableWidgetItem(ap_code) - - ap_type_item = QtWidgets.QTableWidgetItem('AM') - ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) - - mark_item = FCCheckBox() - mark_item.setLayoutDirection(QtCore.Qt.RightToLeft) - # if self.ui.aperture_table_visibility_cb.isChecked(): - # mark_item.setChecked(True) - - self.ui.apertures_table.setItem(self.apertures_row, 1, ap_code_item) # Aperture Code - self.ui.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type - self.ui.apertures_table.setCellWidget(self.apertures_row, 5, mark_item) - - self.apertures_row += 1 + # for ap_code in sorted_macros: + # ap_code = str(ap_code) + # + # ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) + # ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + # self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id + # + # ap_code_item = QtWidgets.QTableWidgetItem(ap_code) + # + # ap_type_item = QtWidgets.QTableWidgetItem('AM') + # ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) + # + # mark_item = FCCheckBox() + # mark_item.setLayoutDirection(QtCore.Qt.RightToLeft) + # # if self.ui.aperture_table_visibility_cb.isChecked(): + # # mark_item.setChecked(True) + # + # self.ui.apertures_table.setItem(self.apertures_row, 1, ap_code_item) # Aperture Code + # self.ui.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type + # self.ui.apertures_table.setCellWidget(self.apertures_row, 5, mark_item) + # + # self.apertures_row += 1 self.ui.apertures_table.selectColumn(0) self.ui.apertures_table.resizeColumnsToContents() diff --git a/README.md b/README.md index b53e7275..56bf4397 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing. - remade the Tool Panelize GUI - work in Gerber Export: finished the header export +- fixed the Gerber Object and Gerber Editor Apertures Table to not show extra rows when there are aperture macros in the object 6.05.2019 diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index 1b47c986..d1b29a12 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -2301,12 +2301,13 @@ class FlatCAMGrbEditor(QtCore.QObject): sorted_apertures = sorted(sort) - sort = [] - for k, v in list(self.gerber_obj.aperture_macros.items()): - sort.append(k) - sorted_macros = sorted(sort) + # sort = [] + # for k, v in list(self.gerber_obj.aperture_macros.items()): + # sort.append(k) + # sorted_macros = sorted(sort) - n = len(sorted_apertures) + len(sorted_macros) + # n = len(sorted_apertures) + len(sorted_macros) + n = len(sorted_apertures) self.apertures_table.setRowCount(n) for ap_code in sorted_apertures: @@ -2359,25 +2360,25 @@ class FlatCAMGrbEditor(QtCore.QObject): # set now the last aperture selected self.last_aperture_selected = ap_code - for ap_code in sorted_macros: - ap_code = str(ap_code) - - ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) - ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) - self.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id - - ap_code_item = QtWidgets.QTableWidgetItem(ap_code) - - ap_type_item = QtWidgets.QTableWidgetItem('AM') - ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) - - self.apertures_table.setItem(self.apertures_row, 1, ap_code_item) # Aperture Code - self.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type - - self.apertures_row += 1 - if first_run is True: - # set now the last aperture selected - self.last_aperture_selected = ap_code + # for ap_code in sorted_macros: + # ap_code = str(ap_code) + # + # ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) + # ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + # self.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id + # + # ap_code_item = QtWidgets.QTableWidgetItem(ap_code) + # + # ap_type_item = QtWidgets.QTableWidgetItem('AM') + # ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) + # + # self.apertures_table.setItem(self.apertures_row, 1, ap_code_item) # Aperture Code + # self.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type + # + # self.apertures_row += 1 + # if first_run is True: + # # set now the last aperture selected + # self.last_aperture_selected = ap_code self.apertures_table.selectColumn(0) self.apertures_table.resizeColumnsToContents()