- fixed an error in the Gerber Editor

This commit is contained in:
Marius Stanciu
2020-10-30 20:47:06 +02:00
committed by Marius
parent fdfa6a22be
commit 3e1e12f42c
3 changed files with 3 additions and 2 deletions

View File

@@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta
- fixed issue #454; trigger signals for Editor Toolbars lost after changing the layout - fixed issue #454; trigger signals for Editor Toolbars lost after changing the layout
- updated the translation strings - updated the translation strings
- more bugs that were introduced by recent changes done to solve other bugs and so on: fixed issues with the Editors and Delete shortcut - more bugs that were introduced by recent changes done to solve other bugs and so on: fixed issues with the Editors and Delete shortcut
- fixed an error in the Gerber Editor
29.10.2020 29.10.2020

View File

@@ -4081,7 +4081,7 @@ class AppGerberEditor(QtCore.QObject):
log.warning("Found %d clear polygons." % len(global_clear_geo)) log.warning("Found %d clear polygons." % len(global_clear_geo))
if global_clear_geo: if global_clear_geo:
global_clear_geo = MultiPolygon(global_clear_geo) global_clear_geo = unary_union(global_clear_geo)
if isinstance(global_clear_geo, Polygon): if isinstance(global_clear_geo, Polygon):
global_clear_geo = [global_clear_geo] global_clear_geo = [global_clear_geo]

View File

@@ -477,7 +477,7 @@ class FlatCAMDefaults:
"tools_ncc_rest": False, "tools_ncc_rest": False,
"tools_ncc_offset_choice": False, "tools_ncc_offset_choice": False,
"tools_ncc_offset_value": 0.0000, "tools_ncc_offset_value": 0.0000,
"tools_ncc_ref": 0, # ITSELF "tools_ncc_ref": 0, # ITSELF
"tools_ncc_area_shape": "square", "tools_ncc_area_shape": "square",
"tools_ncc_milling_type": 'cl', "tools_ncc_milling_type": 'cl',
"tools_ncc_tool_type": 'C1', "tools_ncc_tool_type": 'C1',