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

- fixed the sizePolicy for the FCComboBox widgets in the Preferences that holds the preprocessors

Browse Source 
- fixed issue with how the preamble / postamble GCode were inserted into the final GCode
This commit is contained in:
Marius Stanciu
2020-10-29 17:16:54 +02:00
parent e6c9aee45b
commit 0a2aff9296
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
- added a protection on opening the tools database UI if the tools DB file is not loaded - added a protection on opening the tools database UI if the tools DB file is not loaded
- fixed NCC Tool not working with the new changes; the check for not having complete isolation is just a Warning - fixed NCC Tool not working with the new changes; the check for not having complete isolation is just a Warning
- fixed the sizePolicy for the FCComboBox widgets in the Preferences that holds the preprocessors - fixed the sizePolicy for the FCComboBox widgets in the Preferences that holds the preprocessors
- fixed issue with how the preamble / postamble GCode were inserted into the final GCode
28.10.2020 28.10.2020

19
appObjects/FlatCAMCNCJob.py
View File

@@ -188,8 +188,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.mm = None self.mm = None
self.mr = None self.mr = None
self.append_snippet = ''
self.prepend_snippet = '' self.prepend_snippet = ''
self.append_snippet = ''
self.gc_header = self.gcode_header() self.gc_header = self.gcode_header()
self.gc_start = '' self.gc_start = ''
self.gc_end = '' self.gc_end = ''
@@ -532,7 +532,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.append_snippet = self.app.defaults['cncjob_append'] self.append_snippet = self.app.defaults['cncjob_append']
self.prepend_snippet = self.app.defaults['cncjob_prepend'] self.prepend_snippet = self.app.defaults['cncjob_prepend']
if self.append_snippet != '' or self.prepend_snippet: if self.append_snippet != '' or self.prepend_snippet != '':
self.ui.snippets_cb.set_value(True) self.ui.snippets_cb.set_value(True)
# Fill form fields only on object create # Fill form fields only on object create
@@ -661,8 +661,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.sal_btn.show() self.ui.sal_btn.show()
self.ui.sal_btn.setChecked(self.app.defaults["cncjob_al_status"]) self.ui.sal_btn.setChecked(self.app.defaults["cncjob_al_status"])
preamble = self.append_snippet preamble = self.prepend_snippet
postamble = self.prepend_snippet postamble = self.append_snippet
gc = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True) gc = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True)
self.source_file = gc.getvalue() self.source_file = gc.getvalue()
@@ -1950,8 +1950,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
try: try:
if self.ui.snippets_cb.get_value(): if self.ui.snippets_cb.get_value():
preamble = self.append_snippet preamble = self.prepend_snippet
postamble = self.prepend_snippet postamble = self.append_snippet
gc = self.export_gcode(filename, preamble=preamble, postamble=postamble) gc = self.export_gcode(filename, preamble=preamble, postamble=postamble)
except Exception as err: except Exception as err:
log.debug("CNCJobObject.export_gcode_handler() --> %s" % str(err)) log.debug("CNCJobObject.export_gcode_handler() --> %s" % str(err))
@@ -1965,18 +1965,17 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.app.file_saved.emit("gcode", filename) self.app.file_saved.emit("gcode", filename)
self.app.inform.emit('[success] %s: %s' % (_("File saved to"), filename)) self.app.inform.emit('[success] %s: %s' % (_("File saved to"), filename))
def on_review_code_click(self, *args): def on_review_code_click(self):
""" """
Handler activated by a button clicked when reviewing GCode. Handler activated by a button clicked when reviewing GCode.
:param args:
:return: :return:
""" """
self.app.proc_container.view.set_busy(_("Loading...")) self.app.proc_container.view.set_busy(_("Loading..."))
preamble = self.append_snippet preamble = self.prepend_snippet
postamble = self.prepend_snippet postamble = self.append_snippet
gco = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True) gco = self.export_gcode(preamble=preamble, postamble=postamble, to_file=True)
if gco == 'fail': if gco == 'fail':