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

- added a fix so the app close is now clean, with exit code 0 as set

Browse Source
This commit is contained in:
Marius Stanciu
2020-05-07 00:46:02 +03:00
committed by Marius
parent a161354c25
commit 4ece23c456
5 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flatcamObjects/FlatCAMGeometry.py
View File

@@ -1674,15 +1674,11 @@ class GeometryObject(FlatCAMObj, Geometry):
The actual work is done by the target CNCJobObject object's
`generate_from_geometry_2()` method.
:param tools_dict: a dictionary that holds the whole data needed to create the Gcode
(including the solid_geometry)
:param tools_in_use: the tools that are used, needed by some preprocessors
:type list of lists, each list in the list is made out of row elements of tools table from GUI
:param outname:
:param tools_dict:
:param tools_in_use:
:param tools_dict: a dictionary that holds the whole data needed to create the Gcode
(including the solid_geometry)
:param tools_in_use: the tools that are used, needed by some preprocessors
:type tools_in_use list of lists, each list in the list is made out of row elements of tools table from GUI
:param segx: number of segments on the X axis, for auto-levelling
:param segy: number of segments on the Y axis, for auto-levelling
:param plot: if True the generated object will be plotted; if False will not be plotted
@@ -1726,7 +1722,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# count the tools
tool_cnt = 0
dia_cnc_dict = {}
# dia_cnc_dict = {}
# this turn on the FlatCAMCNCJob plot for multiple tools
job_obj.multitool = True
@@ -1866,7 +1862,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# count the tools
tool_cnt = 0
dia_cnc_dict = {}
# dia_cnc_dict = {}
# this turn on the FlatCAMCNCJob plot for multiple tools
job_obj.multitool = True
@@ -2040,7 +2036,7 @@ class GeometryObject(FlatCAMObj, Geometry):
use_thread=True,
plot=True):
"""
Only used for TCL Command.
Only used by the TCL Command Cncjob.
Creates a CNCJob out of this Geometry object. The actual
work is done by the target camlib.CNCjob
`generate_from_geometry_2()` method.