- wip in the GCode Editor

This commit is contained in:
Marius Stanciu
2020-07-22 17:08:40 +03:00
parent 9e8ab610b4
commit cf78211a6f
9 changed files with 174 additions and 74 deletions

View File

@@ -1797,6 +1797,7 @@ class ToolDrilling(AppTool, Excellon):
self.total_gcode_parsed += tool_gcode_parsed
job_obj.gcode = self.total_gcode
job_obj.source_file = self.total_gcode
job_obj.gcode_parsed = self.total_gcode_parsed
if job_obj.gcode == 'fail':
return 'fail'

View File

@@ -913,6 +913,7 @@ class SolderPaste(AppTool):
job_obj.options['xmax'] = xmax
job_obj.options['ymax'] = ymax
total_gcode = ''
for tooluid_key, tooluid_value in obj.tools.items():
# find the tool_dia associated with the tooluid_key
tool_dia = tooluid_value['tooldia']
@@ -934,6 +935,7 @@ class SolderPaste(AppTool):
return 'fail'
else:
tool_cnc_dict['gcode'] = res
total_gcode += res
# ## PARSE GCODE # ##
tool_cnc_dict['gcode_parsed'] = job_obj.gcode_parse()
@@ -949,6 +951,8 @@ class SolderPaste(AppTool):
})
tool_cnc_dict.clear()
job_obj.source_file = total_gcode
if use_thread:
# To be run in separate thread
def job_thread(app_obj):