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

@ -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

View File

@ -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

View File

@ -3040,6 +3040,7 @@ class CNCjob(Geometry):
# ############################################################################################################# # #############################################################################################################
points = {} points = {}
for tool, tool_dict in self.exc_tools.items(): for tool, tool_dict in self.exc_tools.items():
if tool in tools:
if self.app.abort_flag: if self.app.abort_flag:
# graceful abort requested by the user # graceful abort requested by the user
raise grace raise grace