giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in Dmitriy-Klabukov/fix-for-exception-while-merging-excellon-1608664398630 (pull request #330) 

Fix for exception while merging excellons if there is no slots in second one
This commit is contained in:
Dmitriy Klabukov 2020-12-25 17:46:03 +00:00 committed by Marius Stanciu
parent a8a2f6b0e9 4abeb7e539
commit 8f88fb2749
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
appObjects/FlatCAMExcellon.py
View File

@ -1313,7 +1313,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
break
if t:
fused_tools_dict[t]['drills'] += tool_dict['drills']
fused_tools_dict[t]['slots'] += tool_dict['slots']
if 'slots' in tool_dict and tool_dict['slots']:
fused_tools_dict[t]['slots'] += tool_dict['slots']
fused_tools_dict[t]['solid_geometry'] += tool_dict['solid_geometry']
else:
fused_tools_dict[toolid] = tool_dict