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

- in Gerber Editor fixed bug with the row selection that no longer selected the visuals on canvas

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-31 00:34:17 +03:00
committed by Marius
parent a7d790ef7c
commit 7dfb8152ce
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -17,6 +17,7 @@ CHANGELOG for FlatCAM beta
- add HUD rectangle auto size for 2D Graphic Engine - add HUD rectangle auto size for 2D Graphic Engine
- the Y axis labels are now rotated at 45 degrees allowing better space management - the Y axis labels are now rotated at 45 degrees allowing better space management
- changed the HUD color, with Light theme, to gray - changed the HUD color, with Light theme, to gray
- in Gerber Editor fixed bug with the row selection that no longer selected the visuals on canvas
29.08.2021 29.08.2021

11
appEditors/AppGerberEditor.py
View File

@@ -383,7 +383,7 @@ class PadEditorGrb(ShapeToolEditorGrb):
try: try:
self.geometry = DrawToolShape(self.util_shape(self.points)) self.geometry = DrawToolShape(self.util_shape(self.points))
except Exception as e: except Exception as e:
log.error("PadEditorGrb.make() --> %s" % str(e)) log.error("AppGerberEditor.PadEditorGrb.make() --> %s" % str(e))
self.draw_app.in_action = False self.draw_app.in_action = False
self.complete = True self.complete = True
@@ -624,7 +624,7 @@ class PadArrayEditorGrb(ShapeToolEditorGrb):
return DrawToolUtilityShape(utility_list) return DrawToolUtilityShape(utility_list)
except Exception as e: except Exception as e:
log.error(str(e)) log.error("AppGerberEditor.PadArrayEditorGrb.utility_geometry() -> %s" % str(e))
def util_shape(self, point): def util_shape(self, point):
# updating values here allows us to change the aperture on the fly, after the Tool has been started # updating values here allows us to change the aperture on the fly, after the Tool has been started
@@ -3598,13 +3598,12 @@ class AppGerberEditor(QtCore.QObject):
self.ui.apertures_table.setRowCount(n) self.ui.apertures_table.setRowCount(n)
for ap_code in sorted_apertures: for ap_code in sorted_apertures:
ap_code = ap_code
ap_code_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1)) ap_code_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
ap_code_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled) ap_code_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.apertures_table.setItem(self.apertures_row, 0, ap_code_item) # Tool name/id self.ui.apertures_table.setItem(self.apertures_row, 0, ap_code_item) # Tool name/id
ap_code_item = QtWidgets.QTableWidgetItem(ap_code) ap_code_item = QtWidgets.QTableWidgetItem(str(ap_code))
ap_code_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled) ap_code_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
ap_type_item = QtWidgets.QTableWidgetItem(str(self.storage_dict[ap_code]['type'])) ap_type_item = QtWidgets.QTableWidgetItem(str(self.storage_dict[ap_code]['type']))
@@ -4982,13 +4981,13 @@ class AppGerberEditor(QtCore.QObject):
self.selected = [] self.selected = []
try: try:
selected_ap_code = self.ui.apertures_table.item(row, 1).text() selected_ap_code = int(self.ui.apertures_table.item(row, 1).text())
self.last_aperture_selected = copy(selected_ap_code) self.last_aperture_selected = copy(selected_ap_code)
for obj in self.storage_dict[selected_ap_code]['geometry']: for obj in self.storage_dict[selected_ap_code]['geometry']:
self.selected.append(obj) self.selected.append(obj)
except Exception as e: except Exception as e:
self.app.log.error(str(e)) self.app.log.error("AppGerberEditor.on_row_selected() --> %s" % str(e))
# ######################################################################################################### # #########################################################################################################
# ######################### calculate vertex numbers for all selected shapes ############################## # ######################### calculate vertex numbers for all selected shapes ##############################