- fixed the Gerber.merge() to work for the case when one of the merged Gerber objects solid_geometry type is Polygon and not a list

2019-03-20 03:08:07 +02:00
parent bebb827bd2
commit 0eb3ea0283
2 changed files with 8 additions and 3 deletions
--- a/FlatCAMObj.py
+++ b/FlatCAMObj.py
@@ -411,9 +411,13 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
                        except:
                            log.warning("Failed to copy option.", option)

-                for geos in grb.solid_geometry:
-                    grb_final.solid_geometry.append(geos)
-                    grb_final.follow_geometry.append(geos)
+                try:
+                    for geos in grb.solid_geometry:
+                        grb_final.solid_geometry.append(geos)
+                        grb_final.follow_geometry.append(geos)
+                except TypeError:
+                    grb_final.solid_geometry.append(grb.solid_geometry)
+                    grb_final.follow_geometry.append(grb.solid_geometry)

                for ap in grb.apertures:
                    if ap not in grb_final.apertures: