giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests 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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
FlatCAMObj.py
View File

@ -585,12 +585,13 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
sort.append(int(k)) sort.append(int(k))
sorted_apertures = sorted(sort) sorted_apertures = sorted(sort)
sort = [] # sort = []
for k, v in list(self.aperture_macros.items()): # for k, v in list(self.aperture_macros.items()):
sort.append(k) # sort.append(k)
sorted_macros = sorted(sort) # 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) self.ui.apertures_table.setRowCount(n)
for ap_code in sorted_apertures: for ap_code in sorted_apertures:
@ -648,28 +649,28 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
self.apertures_row += 1 self.apertures_row += 1
for ap_code in sorted_macros: # for ap_code in sorted_macros:
ap_code = str(ap_code) # ap_code = str(ap_code)
#
ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) # ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) # 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 # self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id
#
ap_code_item = QtWidgets.QTableWidgetItem(ap_code) # ap_code_item = QtWidgets.QTableWidgetItem(ap_code)
#
ap_type_item = QtWidgets.QTableWidgetItem('AM') # ap_type_item = QtWidgets.QTableWidgetItem('AM')
ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) # ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled)
#
mark_item = FCCheckBox() # mark_item = FCCheckBox()
mark_item.setLayoutDirection(QtCore.Qt.RightToLeft) # mark_item.setLayoutDirection(QtCore.Qt.RightToLeft)
# if self.ui.aperture_table_visibility_cb.isChecked(): # # if self.ui.aperture_table_visibility_cb.isChecked():
# mark_item.setChecked(True) # # 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, 1, ap_code_item) # Aperture Code
self.ui.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type # 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.ui.apertures_table.setCellWidget(self.apertures_row, 5, mark_item)
#
self.apertures_row += 1 # self.apertures_row += 1
self.ui.apertures_table.selectColumn(0) self.ui.apertures_table.selectColumn(0)
self.ui.apertures_table.resizeColumnsToContents() self.ui.apertures_table.resizeColumnsToContents()

1
README.md
View File

@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
- remade the Tool Panelize GUI - remade the Tool Panelize GUI
- work in Gerber Export: finished the header export - 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 6.05.2019

49
flatcamEditors/FlatCAMGrbEditor.py
View File

@ -2301,12 +2301,13 @@ class FlatCAMGrbEditor(QtCore.QObject):
sorted_apertures = sorted(sort) sorted_apertures = sorted(sort)
sort = [] # sort = []
for k, v in list(self.gerber_obj.aperture_macros.items()): # for k, v in list(self.gerber_obj.aperture_macros.items()):
sort.append(k) # sort.append(k)
sorted_macros = sorted(sort) # 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) self.apertures_table.setRowCount(n)
for ap_code in sorted_apertures: for ap_code in sorted_apertures:
@ -2359,25 +2360,25 @@ class FlatCAMGrbEditor(QtCore.QObject):
# set now the last aperture selected # set now the last aperture selected
self.last_aperture_selected = ap_code self.last_aperture_selected = ap_code
for ap_code in sorted_macros: # for ap_code in sorted_macros:
ap_code = str(ap_code) # ap_code = str(ap_code)
#
ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) # ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) # ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id # self.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id
#
ap_code_item = QtWidgets.QTableWidgetItem(ap_code) # ap_code_item = QtWidgets.QTableWidgetItem(ap_code)
#
ap_type_item = QtWidgets.QTableWidgetItem('AM') # ap_type_item = QtWidgets.QTableWidgetItem('AM')
ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled) # 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, 1, ap_code_item) # Aperture Code
self.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type # self.apertures_table.setItem(self.apertures_row, 2, ap_type_item) # Aperture Type
#
self.apertures_row += 1 # self.apertures_row += 1
if first_run is True: # if first_run is True:
# set now the last aperture selected # # set now the last aperture selected
self.last_aperture_selected = ap_code # self.last_aperture_selected = ap_code
self.apertures_table.selectColumn(0) self.apertures_table.selectColumn(0)
self.apertures_table.resizeColumnsToContents() self.apertures_table.resizeColumnsToContents()