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

- fixed bug in Gerber Editor -> selection area handler where if some of the selected shapes did not had the 'solid' geometry will silently abort selection of further shapes

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-19 17:10:53 +03:00
parent f54568e9eb
commit 351da24ded
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -20,7 +20,8 @@ CAD program, and create G-Code for Isolation routing.
- FlatCAM can be run in HEADLESS mode now. This mode can be selected by using the --headless=1 command line argument or by changing the line headless=False to True in config/configuration.txt file. In this mod the Sys Tray Icon menu will hold only the Run Scrip menu entry and Exit entry. - FlatCAM can be run in HEADLESS mode now. This mode can be selected by using the --headless=1 command line argument or by changing the line headless=False to True in config/configuration.txt file. In this mod the Sys Tray Icon menu will hold only the Run Scrip menu entry and Exit entry.
- added a new TclCommand named quit_flatcam which will ... quit FlatCAM from Tcl Shell or from a script - added a new TclCommand named quit_flatcam which will ... quit FlatCAM from Tcl Shell or from a script
- fixed the command line argument --shellvar to work when there are spaces in the argument value - fixed the command line argument --shellvar to work when there are spaces in the argument value
- fixed bug in Gerber editor that did not allow to display all shapes after it encouterd one shape without 'solid' geometry - fixed bug in Gerber editor that did not allow to display all shapes after it encountered one shape without 'solid' geometry
- fixed bug in Gerber Editor -> selection area handler where if some of the selected shapes did not had the 'solid' geometry will silently abort selection of further shapes
18.09.2019 18.09.2019

7
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -4286,8 +4286,8 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.app.delete_selection_shape() self.app.delete_selection_shape()
for storage in self.storage_dict: for storage in self.storage_dict:
try: for obj in self.storage_dict[storage]['geometry']:
for obj in self.storage_dict[storage]['geometry']: if 'solid' in obj.geo:
geometric_data = obj.geo['solid'] geometric_data = obj.geo['solid']
if (sel_type is True and poly_selection.contains(geometric_data)) or \ if (sel_type is True and poly_selection.contains(geometric_data)) or \
(sel_type is False and poly_selection.intersects(geometric_data)): (sel_type is False and poly_selection.intersects(geometric_data)):
@@ -4301,8 +4301,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
else: else:
self.selected.append(obj) self.selected.append(obj)
sel_aperture.add(storage) sel_aperture.add(storage)
except KeyError:
pass
try: try:
self.apertures_table.cellPressed.disconnect() self.apertures_table.cellPressed.disconnect()
except Exception as e: except Exception as e: