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

- fixed Gerber Editor follow_geometry reconstruction -work in progress; still have to add the newly created geometry to follow_geometry

Marius Stanciu 6 лет назад
Родитель
Сommit
0a150fba79
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      flatcamEditors/FlatCAMGrbEditor.py

+ 7 - 3
flatcamEditors/FlatCAMGrbEditor.py

@@ -3069,9 +3069,13 @@ class FlatCAMGrbEditor(QtCore.QObject):
 
 
                     elif k == 'follow_geometry':
                     elif k == 'follow_geometry':
                         grb_obj.apertures[storage_apid][k] = []
                         grb_obj.apertures[storage_apid][k] = []
-                        for geo in v:
-                            geo = (geo.geo.buffer(-int(k) / 2)).exterior
-                            new_geo = deepcopy(geo)
+                        for geo_f in v:
+                            if isinstance(geo_f.geo, Polygon):
+                                buff_val = -(int(storage_apid) / 2)
+                                geo_f = geo_f.geo.buffer(buff_val).exterior
+                                new_geo = deepcopy(geo_f)
+                            else:
+                                new_geo = deepcopy(geo_f.geo)
                             grb_obj.apertures[storage_apid][k].append(new_geo)
                             grb_obj.apertures[storage_apid][k].append(new_geo)
                             follow_buffer.append(new_geo)
                             follow_buffer.append(new_geo)
                     else:
                     else: