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

Fixed Geometry merging. Solves issue #99.

Browse Source
This commit is contained in:
Juan Pablo Caram
2015-01-18 20:23:37 -05:00
parent 840cfcf9ff
commit 34a6b60053
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
FlatCAMObj.py
View File

@@ -875,16 +875,28 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
:param geo_final: Destination FlatCAMGeometry object.
:return: None
"""
geo_final.solid_geometry = []
if geo_final.solid_geometry is None:
geo_final.solid_geometry = []
if type(geo_final.solid_geometry) is not list:
geo_final.solid_geometry = [geo_final.solid_geometry]
for geo in geo_list:
try: # Iterable
for shape in geo.solid_geometry:
geo_final.solid_geometry.append(shape)
# Expand lists
if type(geo) is list:
FlatCAMGeometry.merge(geo, geo_final)
except TypeError: # Non-iterable
geo_final.solid_geometry.append(geo)
# If not list, just append
else:
geo_final.solid_geometry.append(geo.solid_geometry)
# try: # Iterable
# for shape in geo.solid_geometry:
# geo_final.solid_geometry.append(shape)
#
# except TypeError: # Non-iterable
# geo_final.solid_geometry.append(geo.solid_geometry)
def __init__(self, name):
FlatCAMObj.__init__(self, name)