- wip
This commit is contained in:
parent
c1a6bcc9f0
commit
a833b3e3d4
|
@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
21.06.2020
|
||||||
|
|
||||||
|
- wip
|
||||||
|
|
||||||
18.06.2020
|
18.06.2020
|
||||||
|
|
||||||
- fixed bug in the Cutout Tool that did not allowed the manual cutous to be added on a Geometry created in the Tool
|
- fixed bug in the Cutout Tool that did not allowed the manual cutous to be added on a Geometry created in the Tool
|
||||||
|
|
|
@ -552,6 +552,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
||||||
"milling_type": self.ui.milling_type_radio,
|
"milling_type": self.ui.milling_type_radio,
|
||||||
|
|
||||||
"milling_dia": self.ui.mill_dia_entry,
|
"milling_dia": self.ui.mill_dia_entry,
|
||||||
|
|
||||||
"cutz": self.ui.cutz_entry,
|
"cutz": self.ui.cutz_entry,
|
||||||
"multidepth": self.ui.mpass_cb,
|
"multidepth": self.ui.mpass_cb,
|
||||||
"depthperpass": self.ui.maxdepth_entry,
|
"depthperpass": self.ui.maxdepth_entry,
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
19
camlib.py
19
camlib.py
|
@ -3040,16 +3040,17 @@ class CNCjob(Geometry):
|
||||||
# #############################################################################################################
|
# #############################################################################################################
|
||||||
points = {}
|
points = {}
|
||||||
for tool, tool_dict in self.exc_tools.items():
|
for tool, tool_dict in self.exc_tools.items():
|
||||||
if self.app.abort_flag:
|
if tool in tools:
|
||||||
# graceful abort requested by the user
|
if self.app.abort_flag:
|
||||||
raise grace
|
# graceful abort requested by the user
|
||||||
|
raise grace
|
||||||
|
|
||||||
if 'drills' in tool_dict and tool_dict['drills']:
|
if 'drills' in tool_dict and tool_dict['drills']:
|
||||||
for drill_pt in tool_dict['drills']:
|
for drill_pt in tool_dict['drills']:
|
||||||
try:
|
try:
|
||||||
points[tool].append(drill_pt)
|
points[tool].append(drill_pt)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
points[tool] = [drill_pt]
|
points[tool] = [drill_pt]
|
||||||
log.debug("Found %d TOOLS with drills." % len(points))
|
log.debug("Found %d TOOLS with drills." % len(points))
|
||||||
|
|
||||||
# check if there are drill points in the exclusion areas.
|
# check if there are drill points in the exclusion areas.
|
||||||
|
|
Loading…
Reference in New Issue