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

- added a 'return' button when a fatal error is encountered allowing the user to continue the work

Browse Source 
- fixed a crash in Milling Plugin when trying to mill slots that do not have drills in the same file
This commit is contained in:
Marius Stanciu
2022-11-19 02:29:40 +02:00
parent 22f4d92be7
commit c1377d5090
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
appPlugins/ToolMilling.py
View File

@@ -2819,18 +2819,27 @@ class ToolMilling(AppTool, Excellon):
buff_dia = float(tools_dict[tool]['tooldia']) / 2.0 + offset
if mill_type in ['drills', 'both']:
drills_tool_geo = [
d_p.buffer(buff_dia) for d_p in tools_dict[tool]['drills']
]
total_paint_geo = drills_tool_geo
elif mill_type in ['slots', 'both']:
slots_tool_geo = [
LineString(s_l).buffer(buff_dia) for s_l in tools_dict[tool]['slots']
]
total_paint_geo = slots_tool_geo
elif mill_type == 'both':
try:
drills_tool_geo = [
d_p.buffer(buff_dia) for d_p in tools_dict[tool]['drills']
]
total_paint_geo = drills_tool_geo
except KeyError:
total_paint_geo = []
if mill_type in ['slots', 'both']:
try:
slots_tool_geo = [
LineString(s_l).buffer(buff_dia) for s_l in tools_dict[tool]['slots']
]
total_paint_geo = slots_tool_geo
except KeyError:
total_paint_geo = []
if mill_type == 'both':
total_paint_geo = drills_tool_geo + slots_tool_geo
if not total_paint_geo:
continue
pol_nr = 0
geo_len = len(total_paint_geo)
cp = []