This commit is contained in:
Marius Stanciu
2020-06-21 08:00:36 +03:00
committed by Marius
parent c1a6bcc9f0
commit a833b3e3d4
4 changed files with 1221 additions and 413 deletions

View File

@@ -3040,16 +3040,17 @@ class CNCjob(Geometry):
# #############################################################################################################
points = {}
for tool, tool_dict in self.exc_tools.items():
if self.app.abort_flag:
# graceful abort requested by the user
raise grace
if tool in tools:
if self.app.abort_flag:
# graceful abort requested by the user
raise grace
if 'drills' in tool_dict and tool_dict['drills']:
for drill_pt in tool_dict['drills']:
try:
points[tool].append(drill_pt)
except KeyError:
points[tool] = [drill_pt]
if 'drills' in tool_dict and tool_dict['drills']:
for drill_pt in tool_dict['drills']:
try:
points[tool].append(drill_pt)
except KeyError:
points[tool] = [drill_pt]
log.debug("Found %d TOOLS with drills." % len(points))
# check if there are drill points in the exclusion areas.