bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed the Gerber Object and Gerber Editor Apertures Table to not show extra rows when there are aperture macros in the object

Browse Source
This commit is contained in:
Marius Stanciu
2019-05-07 15:24:20 +03:00
committed by Marius
parent cb355d6070
commit b9fa2e2bfd
3 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -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()