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

- attempting to fix issue #492 - when checking for tools present in the database there were some errors in the NCC, ISO, MILL, PAINT and CUTOUT Tools

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-09 23:25:10 +02:00
committed by Marius Stanciu
parent 9e9eabb04e
commit 8c8b781bdb
8 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appTools/ToolCutOut.py
View File

@@ -521,10 +521,10 @@ class CutOut(AppTool):
if truncated_tooldia == db_tooldia:
tool_found += 1
for d in db_tool_val['data']:
if d.find('tools_cutout') == 0:
if d.find('tools_cutout_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_cutout_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]
@@ -533,10 +533,10 @@ class CutOut(AppTool):
tool_found += 1
updated_tooldia = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_cutout') == 0:
if d.find('tools_cutout_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_cutout_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]

4
appTools/ToolDrilling.py
View File

@@ -1050,7 +1050,7 @@ class ToolDrilling(AppTool, Excellon):
if orig_tooldia == db_tooldia:
tool_found += 1
for d in db_tool_val['data']:
if d.find('tools_drill') == 0:
if d.find('tools_drill_') == 0:
new_tools_dict[orig_tool]['data'][d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
@@ -1062,7 +1062,7 @@ class ToolDrilling(AppTool, Excellon):
tool_found += 1
new_tools_dict[orig_tool]['tooldia'] = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_drill') == 0:
if d.find('tools_drill_') == 0:
new_tools_dict[orig_tool]['data'][d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'

8
appTools/ToolIsolation.py
View File

@@ -1311,10 +1311,10 @@ class ToolIsolation(AppTool, Gerber):
if truncated_tooldia == db_tooldia:
tool_found += 1
for d in db_tool_val['data']:
if d.find('tools_iso') == 0:
if d.find('tools_iso_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_iso_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]
@@ -1323,10 +1323,10 @@ class ToolIsolation(AppTool, Gerber):
tool_found += 1
updated_tooldia = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_iso') == 0:
if d.find('tools_iso_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_iso_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]

4
appTools/ToolMilling.py
View File

@@ -1883,10 +1883,10 @@ class ToolMilling(AppTool, Excellon):
tool_found += 1
updated_tooldia = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_mill') == 0:
if d.find('tools_mill_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_mill_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]

8
appTools/ToolNCC.py
View File

@@ -1280,10 +1280,10 @@ class NonCopperClear(AppTool, Gerber):
if truncated_tooldia == db_tooldia:
tool_found += 1
for d in db_tool_val['data']:
if d.find('tools_iso') == 0:
if d.find('tools_ncc_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_ncc_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]
@@ -1292,10 +1292,10 @@ class NonCopperClear(AppTool, Gerber):
tool_found += 1
updated_tooldia = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_iso') == 0:
if d.find('tools_ncc_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_ncc_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]

8
appTools/ToolPaint.py
View File

@@ -881,10 +881,10 @@ class ToolPaint(AppTool, Gerber):
if truncated_tooldia == db_tooldia:
tool_found += 1
for d in db_tool_val['data']:
if d.find('tools_paint') == 0:
if d.find('tools_paint_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_paint_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]
@@ -893,10 +893,10 @@ class ToolPaint(AppTool, Gerber):
tool_found += 1
updated_tooldia = db_tooldia
for d in db_tool_val['data']:
if d.find('tools_paint') == 0:
if d.find('tools_paint_') == 0:
new_tools_dict[d] = db_tool_val['data'][d]
elif d.find('tools_') == 0:
# don't need data for other App Tools; this tests after 'tools_drill_'
# don't need data for other App Tools; this tests after 'tools_paint_'
continue
else:
new_tools_dict[d] = db_tool_val['data'][d]