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

8
flatcamObjects/FlatCAMGeometry.py
View File

@@ -2519,10 +2519,10 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.plot_cb.setChecked(True)
self.ui_connect()
def merge(self, geo_list, geo_final, multigeo=None):
@staticmethod
def merge(geo_list, geo_final, multigeo=None):
"""
Merges the geometry of objects in grb_list into
the geometry of geo_final.
Merges the geometry of objects in grb_list into the geometry of geo_final.
:param geo_list: List of GerberObject Objects to join.
:param geo_final: Destination GerberObject object.
@@ -2552,7 +2552,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# Expand lists
if type(geo_obj) is list:
GeometryObject.merge(self, geo_list=geo_obj, geo_final=geo_final)
GeometryObject.merge(geo_list=geo_obj, geo_final=geo_final)
# If not list, just append
else:
if multigeo is None or multigeo is False: