- fixed the TclCommand cncjob to use the -outname parameter

- added some more keywords in the data_model for auto-completer
This commit is contained in:
Marius Stanciu
2019-09-15 16:46:48 +03:00
committed by Marius
parent 30f00abce8
commit 8b3e1b5a77
5 changed files with 37 additions and 14 deletions

View File

@@ -4518,7 +4518,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Failed. No tool selected in the tool table ..."))
def mtool_gen_cncjob(self, tools_dict=None, tools_in_use=None, segx=None, segy=None, use_thread=True):
def mtool_gen_cncjob(self, outname=None, tools_dict=None, tools_in_use=None, segx=None, segy=None, use_thread=True):
"""
Creates a multi-tool CNCJob out of this Geometry object.
The actual work is done by the target FlatCAMCNCjob object's
@@ -4537,7 +4537,10 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
"""
# use the name of the first tool selected in self.geo_tools_table which has the diameter passed as tool_dia
outname = "%s_%s" % (self.options["name"], 'cnc')
if outname is None:
outname = "%s_%s" % (self.options["name"], 'cnc')
else:
outname = outname
tools_dict = self.sel_tools if tools_dict is None else tools_dict
tools_in_use = tools_in_use if tools_in_use is not None else self.get_selected_tools_table_items()