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

- working on a proper GCode Editor

Browse Source
This commit is contained in:
Marius Stanciu
2020-07-22 15:49:52 +03:00
parent 65d4f70b21
commit 9e8ab610b4
7 changed files with 245 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app_Main.py
View File

@@ -7745,10 +7745,7 @@ class App(QtCore.QObject):
# then append the text from GCode to the text editor
if obj.kind == 'cncjob':
try:
file = obj.export_gcode(
preamble=self.defaults["cncjob_prepend"],
postamble=self.defaults["cncjob_append"],
to_file=True)
file = obj.export_gcode(to_file=True)
if file == 'fail':
return 'fail'
except AttributeError:
@@ -8665,14 +8662,14 @@ class App(QtCore.QObject):
def job_thread_grb(app_obj):
ret = make_gerber()
if ret == 'fail':
self.inform.emit('[ERROR_NOTCL] %s' % _('Could not export Gerber file.'))
self.inform.emit('[ERROR_NOTCL] %s' % _('Could not export file.'))
return
self.worker_task.emit({'fcn': job_thread_grb, 'params': [self]})
else:
gret = make_gerber()
if gret == 'fail':
self.inform.emit('[ERROR_NOTCL] %s' % _('Could not export Gerber file.'))
self.inform.emit('[ERROR_NOTCL] %s' % _('Could not export file.'))
return 'fail'
if local_use is not None:
return gret