From fbdcb00eb32bf8a0529ad7076348510ccdf78978 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 9 Apr 2019 17:56:28 +0300 Subject: [PATCH] - Gerber Editor: working on aperture selection to show on Aperture Table --- README.md | 1 + flatcamEditors/FlatCAMGrbEditor.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eaf4841a..a1a8153e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 9.04.2019 - Gerber Editor: added buffer and scale tools +- Gerber Editor: working on aperture selection to show on Aperture Table 7.04.2019 diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index e394528f..3ced3846 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -448,7 +448,20 @@ class FCApertureSelect(DrawTool): self.grb_editor_app.selected = [] def click_release(self, point): - # self.select_shapes(point) + self.grb_editor_app.apertures_table.clearSelection() + sel_aperture = set() + for storage in self.grb_editor_app.storage_dict: + for shape in self.grb_editor_app.storage_dict[storage]['solid_geometry']: + if Point(point).within(shape.geo): + sel_aperture.add(storage) + try: + self.grb_editor_app.apertures_table.itemClicked.disconnect() + except: + pass + for aper in sel_aperture: + for row in range(self.grb_editor_app.apertures_table.rowCount()): + if str(aper) == self.grb_editor_app.apertures_table.item(row, 1).text(): + self.grb_editor_app.apertures_table.selectRow(row) return "" # def select_shapes(self, pos):