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

- major rafactoring: replaced the name of the Gerber object data structure from 'apertures' to 'tools' to make the object data structure uniform across the app

Browse Source
This commit is contained in:
Marius Stanciu
2021-03-01 17:46:23 +02:00
committed by Marius
parent fe1ea7b12a
commit e715870d12
29 changed files with 533 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appPlugins/ToolPDF.py
View File

@@ -304,12 +304,12 @@ class ToolPDF(AppTool):
def obj_init(grb_obj, app_obj):
grb_obj.apertures = ap_dict
grb_obj.tools = ap_dict
poly_buff = []
follow_buf = []
for ap in grb_obj.apertures:
for k in grb_obj.apertures[ap]:
for ap in grb_obj.tools:
for k in grb_obj.tools[ap]:
if k == 'geometry':
for geo_el in ap_dict[ap][k]:
if 'solid' in geo_el:
@@ -318,18 +318,18 @@ class ToolPDF(AppTool):
follow_buf.append(geo_el['follow'])
poly_buff = unary_union(poly_buff)
if '0' in grb_obj.apertures:
if '0' in grb_obj.tools:
global_clear_geo = []
if 'geometry' in grb_obj.apertures['0']:
if 'geometry' in grb_obj.tools['0']:
for geo_el in ap_dict['0']['geometry']:
if 'clear' in geo_el:
global_clear_geo.append(geo_el['clear'])
if global_clear_geo:
solid = []
for apid in grb_obj.apertures:
if 'geometry' in grb_obj.apertures[apid]:
for elem in grb_obj.apertures[apid]['geometry']:
for apid in grb_obj.tools:
if 'geometry' in grb_obj.tools[apid]:
for elem in grb_obj.tools[apid]['geometry']:
if 'solid' in elem:
solid_geo = deepcopy(elem['solid'])
for clear_geo in global_clear_geo: