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:
commit
8f88fb2749
|
@ -1313,7 +1313,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
||||||
break
|
break
|
||||||
if t:
|
if t:
|
||||||
fused_tools_dict[t]['drills'] += tool_dict['drills']
|
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']
|
fused_tools_dict[t]['solid_geometry'] += tool_dict['solid_geometry']
|
||||||
else:
|
else:
|
||||||
fused_tools_dict[toolid] = tool_dict
|
fused_tools_dict[toolid] = tool_dict
|
||||||
|
|
Loading…
Reference in New Issue