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

- fixed the merge methods for all FlatCAM objects

Browse Source
This commit is contained in:
Marius Stanciu
2020-04-29 11:10:43 +03:00
committed by Marius
parent 2ca6e2e3f1
commit b8d85d2be2
7 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatcamObjects/FlatCAMGerber.py
View File

@@ -39,7 +39,8 @@ class GerberObject(FlatCAMObj, Gerber):
ui_type = GerberObjectUI
def merge(self, grb_list, grb_final):
@staticmethod
def merge(grb_list, grb_final):
"""
Merges the geometry of objects in geo_list into
the geometry of geo_final.
@@ -64,7 +65,7 @@ class GerberObject(FlatCAMObj, Gerber):
# Expand lists
if type(grb) is list:
GerberObject.merge(grb, grb_final)
GerberObject.merge(grb_list=grb, grb_final=grb_final)
else: # If not list, just append
for option in grb.options:
if option != 'name':