From 3e1e12f42ce84398334140a6ef9c243e5198b4ae Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 30 Oct 2020 20:47:06 +0200 Subject: [PATCH] - fixed an error in the Gerber Editor --- CHANGELOG.md | 1 + appEditors/AppGerberEditor.py | 2 +- defaults.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac28891a..14eb7e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta - fixed issue #454; trigger signals for Editor Toolbars lost after changing the layout - 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 +- fixed an error in the Gerber Editor 29.10.2020 diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index c7545320..ea0382df 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -4081,7 +4081,7 @@ class AppGerberEditor(QtCore.QObject): log.warning("Found %d clear polygons." % len(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): global_clear_geo = [global_clear_geo] diff --git a/defaults.py b/defaults.py index a36aa0cb..2b4cedd9 100644 --- a/defaults.py +++ b/defaults.py @@ -477,7 +477,7 @@ class FlatCAMDefaults: "tools_ncc_rest": False, "tools_ncc_offset_choice": False, "tools_ncc_offset_value": 0.0000, - "tools_ncc_ref": 0, # ITSELF + "tools_ncc_ref": 0, # ITSELF "tools_ncc_area_shape": "square", "tools_ncc_milling_type": 'cl', "tools_ncc_tool_type": 'C1',