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

8
appPlugins/ToolIsolation.py
View File

@@ -1087,7 +1087,7 @@ class ToolIsolation(AppTool, Gerber):
def job_thread(app_obj):
with self.app.proc_container.new(_("Checking ...")):
ap_storage = fcobj.apertures
ap_storage = fcobj.tools
p = app_obj.pool.apply_async(self.find_optim_mp, args=(ap_storage, self.decimals))
res = p.get()
@@ -1157,9 +1157,9 @@ class ToolIsolation(AppTool, Gerber):
app_obj.proc_container.update_view_text(' %d%%' % 0)
total_geo = []
for ap in list(fcobj.apertures.keys()):
if 'geometry' in fcobj.apertures[ap]:
for geo_el in fcobj.apertures[ap]['geometry']:
for ap in list(fcobj.tools.keys()):
if 'geometry' in fcobj.tools[ap]:
for geo_el in fcobj.tools[ap]['geometry']:
if self.app.abort_flag:
# graceful abort requested by the user
raise grace