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

- GCode Editor - closing the Editor will close also the Code Editor Tab

Browse Source 
- cleanup of the CNCJob UI; added a checkbox to signal if any append/prepend gcode was set in Preferences (unchecking it will override and disable the usage of the append/prepend GCode)
- the start Gcode is now stored in the CNCJob object attribute gc_start
- GCode Editor - finished adding the ability to select a row in the Tools table and select the related GCode
This commit is contained in:
Marius Stanciu
2020-08-02 16:27:30 +03:00
committed by Marius
parent 840db915f1
commit 44411cdc82
9 changed files with 411 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
appTools/ToolDrilling.py
View File

@@ -1725,12 +1725,13 @@ class ToolDrilling(AppTool, Excellon):
job_obj.options['Tools_in_use'] = tool_table_items
# generate GCode
tool_gcode, __ = job_obj.excellon_tool_gcode_gen(used_tool, tool_points, self.excellon_tools,
first_pt=first_drill_point,
is_first=True,
is_last=True,
opt_type=used_excellon_optimization_type,
toolchange=True)
tool_gcode, __, start_gcode = job_obj.excellon_tool_gcode_gen(used_tool, tool_points,
self.excellon_tools,
first_pt=first_drill_point,
is_first=True,
is_last=True,
opt_type=used_excellon_optimization_type,
toolchange=True)
# parse the Gcode
tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode,
@@ -1748,6 +1749,9 @@ class ToolDrilling(AppTool, Excellon):
if e_tool_dia != used_tooldia:
job_obj.exc_cnc_tools.pop(e_tool_dia, None)
if start_gcode != '':
job_obj.gc_start = start_gcode
self.total_gcode = tool_gcode
self.total_gcode_parsed = tool_gcode_parsed
@@ -1778,12 +1782,13 @@ class ToolDrilling(AppTool, Excellon):
is_first_tool = True if tool == sel_tools[0] else False
# Generate Gcode for the current tool
tool_gcode, last_pt = job_obj.excellon_tool_gcode_gen(tool, tool_points, self.excellon_tools,
first_pt=first_drill_point,
is_first=is_first_tool,
is_last=is_last_tool,
opt_type=used_excellon_optimization_type,
toolchange=True)
tool_gcode, last_pt, start_gcode = job_obj.excellon_tool_gcode_gen(
tool, tool_points, self.excellon_tools,
first_pt=first_drill_point,
is_first=is_first_tool,
is_last=is_last_tool,
opt_type=used_excellon_optimization_type,
toolchange=True)
# parse Gcode for the current tool
tool_gcode_parsed = job_obj.excellon_tool_gcode_parse(used_tooldia, gcode=tool_gcode,
@@ -1794,6 +1799,9 @@ class ToolDrilling(AppTool, Excellon):
job_obj.exc_cnc_tools[used_tooldia]['gcode'] = tool_gcode
job_obj.exc_cnc_tools[used_tooldia]['gcode_parsed'] = tool_gcode_parsed
if start_gcode != '':
job_obj.gc_start = start_gcode
self.total_gcode += tool_gcode
self.total_gcode_parsed += tool_gcode_parsed