- merged PR by Dmitriy Klabukov and expanded it a bit

- Gerber Editor - made sure that when simplification button is clicked the coordinates and vertex points field are cleared
- Gerber Editor - added a Beginner/Advanced toggle button
- Gerber Editor - added context menu to Apertures Table and also on row selection in Aperture Table, the area and vertex number fields are updated
- Excellon Editor - added a Beginner/Advanced toggle button; added context menu to Apertures Table
- Excellon Editor - fixed the Tools Table row selection handler
This commit is contained in:
Marius Stanciu
2020-12-25 20:51:17 +02:00
committed by Marius
parent 89050a7b9b
commit 8e40ddfab0
5 changed files with 255 additions and 45 deletions

View File

@@ -1323,8 +1323,10 @@ class ExcellonObject(FlatCAMObj, Excellon):
t = f_tool
break
if t:
fused_tools_dict[t]['drills'] += tool_dict['drills']
fused_tools_dict[t]['slots'] += tool_dict['slots']
if 'drills' in tool_dict and tool_dict['drills']:
fused_tools_dict[t]['drills'] += tool_dict['drills']
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