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

- fixed the convert 2 excellon and to geometry functionality

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-26 19:27:08 +03:00
committed by Marius
parent 9bd1cdabd6
commit fca2118ee9
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
- updated the Chinese translation, by 俊霄 余 - updated the Chinese translation, by 俊霄 余
- fixed bug in Cutout Plugin that when no object is loaded and the Generate Rectangular Geometry is clicked, the app will hard crash - fixed bug in Cutout Plugin that when no object is loaded and the Generate Rectangular Geometry is clicked, the app will hard crash
- improved rendering performance for lines (with help from David Hoese from the VisPy team) - improved rendering performance for lines (with help from David Hoese from the VisPy team)
- fixed the convert 2 excellon and to geometry functionality
25.08.2021 25.08.2021

24
app_Main.py
View File

@@ -2106,9 +2106,9 @@ class App(QtCore.QObject):
self.ui.menueditdelete.triggered.connect(self.on_delete) self.ui.menueditdelete.triggered.connect(self.on_delete)
self.ui.menueditcopyobject.triggered.connect(self.on_copy_command) self.ui.menueditcopyobject.triggered.connect(self.on_copy_command)
self.ui.menueditconvert_any2geo.triggered.connect(self.convert_any2geo) self.ui.menueditconvert_any2geo.triggered.connect(lambda: self.convert_any2geo())
self.ui.menueditconvert_any2gerber.triggered.connect(self.convert_any2gerber) self.ui.menueditconvert_any2gerber.triggered.connect(lambda: self.convert_any2gerber())
self.ui.menueditconvert_any2excellon.triggered.connect(self.convert_any2excellon) self.ui.menueditconvert_any2excellon.triggered.connect(lambda: self.convert_any2excellon())
self.ui.menueditorigin.triggered.connect(self.on_set_origin) self.ui.menueditorigin.triggered.connect(self.on_set_origin)
self.ui.menuedit_move2origin.triggered.connect(self.on_move2origin) self.ui.menuedit_move2origin.triggered.connect(self.on_move2origin)
@@ -5942,18 +5942,8 @@ class App(QtCore.QObject):
if opt_key.find('geometry' + "_") == 0: if opt_key.find('geometry' + "_") == 0:
oname = opt_key[len('geometry') + 1:] oname = opt_key[len('geometry') + 1:]
default_data[oname] = self.options[opt_key] default_data[oname] = self.options[opt_key]
if opt_key.find('tools_mill' + "_") == 0: else:
oname = opt_key[len('tools_mill') + 1:] default_data[opt_key] = self.options[opt_key]
default_data[oname] = self.options[opt_key]
if opt_key.find('tools_ncc' + "_") == 0:
oname = opt_key[len('tools_ncc') + 1:]
default_data[oname] = self.options[opt_key]
if opt_key.find('tools_paint' + "_") == 0:
oname = opt_key[len('tools_paint') + 1:]
default_data[oname] = self.options[opt_key]
if opt_key.find('tools_cutout' + "_") == 0:
oname = opt_key[len('tools_cutout') + 1:]
default_data[oname] = self.options[opt_key]
if type(self.defaults["tools_mill_tooldia"]) == float: if type(self.defaults["tools_mill_tooldia"]) == float:
tools_diameters = [self.defaults["tools_mill_tooldia"]] tools_diameters = [self.defaults["tools_mill_tooldia"]]
@@ -6131,6 +6121,9 @@ class App(QtCore.QObject):
obj_init.solid_geometry = [] obj_init.solid_geometry = []
for tool in obj.tools:
print(obj.tools[tool])
for geo in obj.solid_geometry: for geo in obj.solid_geometry:
if not isinstance(geo, (Polygon, MultiPolygon, LinearRing)): if not isinstance(geo, (Polygon, MultiPolygon, LinearRing)):
continue continue
@@ -6304,6 +6297,7 @@ class App(QtCore.QObject):
self.log.warning("App.convert_any2excellon --> This is no valid object for conversion.") self.log.warning("App.convert_any2excellon --> This is no valid object for conversion.")
except Exception as e: except Exception as e:
self.log.error("App.convert_any2excellon() --> %s" % str(e))
return "Operation failed: %s" % str(e) return "Operation failed: %s" % str(e)
def abort_all_tasks(self): def abort_all_tasks(self):