Просмотр исходного кода

- fixed an error in the Gerber Editor

Marius Stanciu 5 лет назад
Родитель
Сommit
3e1e12f42c
3 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 1
      appEditors/AppGerberEditor.py
  3. 1 1
      defaults.py

+ 1 - 0
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
 

+ 1 - 1
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]
 

+ 1 - 1
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',