From 948641d5bd6d6c946a4a10b003a71caef40d2bbb Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 4 Jul 2023 22:13:10 +0300 Subject: [PATCH] - Gerber Editor: fixed issue with editing the rectangular aperture dimensions in the Tool Table (I used wrong parameter names to the Shapely box() method) --- CHANGELOG.md | 1 + appEditors/AppGerberEditor.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a10eb00..5abc3b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM Evo beta - fixed a number of bugs reported in the issue #32 here: https://bitbucket.org/marius_stanciu/flatcam_beta/issues/32/crashes-on-close-random-crashes-that - Isolation Plugin: fixed some errors due of trying to get the is_empty property from a list (geometry that was flattened) +- Gerber Editor: fixed issue with editing the rectangular aperture dimensions in the Tool Table (I used wrong parameter names to the Shapely box() method) 1.07.2023 diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index 7b63a922..651cea3d 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -4542,7 +4542,7 @@ class AppGerberEditor(QtCore.QObject): except ValueError as e: self.app.log.debug("AppGerberEditor.on_tool_edit() --> %s" % str(e)) # self.ui.apertures_table.setCurrentItem(None) - # we reactivate the signals after the after the tool editing + # we reactivate the signals after the tool editing self.ui.apertures_table.itemChanged.connect(self.on_tool_edit) return elif col_of_item_changed == 3: @@ -4552,7 +4552,7 @@ class AppGerberEditor(QtCore.QObject): except ValueError as e: self.app.log.debug("AppGerberEditor.on_tool_edit() --> %s" % str(e)) # self.ui.apertures_table.setCurrentItem(None) - # we reactivate the signals after the after the tool editing + # we reactivate the signals after the tool editing self.ui.apertures_table.itemChanged.connect(self.on_tool_edit) return elif col_of_item_changed == 4: @@ -4563,7 +4563,7 @@ class AppGerberEditor(QtCore.QObject): ] except ValueError as e: self.app.log.debug("AppGerberEditor.on_tool_edit() --> %s" % str(e)) - # we reactivate the signals after the after the tool editing + # we reactivate the signals after the tool editing self.ui.apertures_table.itemChanged.connect(self.on_tool_edit) return @@ -4573,7 +4573,7 @@ class AppGerberEditor(QtCore.QObject): str(self.storage_dict[ap_code_new]['height'])) self.ui.apertures_table.currentItem().setText(old_dims_txt) - # we reactivate the signals after the after the tool editing + # we reactivate the signals after the tool editing self.ui.apertures_table.itemChanged.connect(self.on_tool_edit) return else: @@ -4666,7 +4666,7 @@ class AppGerberEditor(QtCore.QObject): miny = y - (new_height / 2) maxx = x + (new_width / 2) maxy = y + (new_height / 2) - geo = box(minx=minx, miny=miny, maxx=maxx, maxy=maxy) + geo = box(xmin=minx, ymin=miny, xmax=maxx, ymax=maxy) new_geo_el['solid'] = deepcopy(geo) else: new_geo_el['solid'] = deepcopy(g_data['solid'].buffer(buff_val_lines)) @@ -4681,7 +4681,7 @@ class AppGerberEditor(QtCore.QObject): miny = y - (new_height / 2) maxx = x + (new_width / 2) maxy = y + (new_height / 2) - geo = box(minx=minx, miny=miny, maxx=maxx, maxy=maxy) + geo = box(xmin=minx, ymin=miny, xmax=maxx, ymax=maxy) new_geo_el['clear'] = deepcopy(geo) else: new_geo_el['clear'] = deepcopy(g_data['clear'].buffer(buff_val_lines, join_style=2))