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

Merged in JakobStaudt/postprocessing (pull request #82)

Browse Source 
Postprocessing GUI and content handover to export_gcode()
This commit is contained in:
Jakob Staudt
2018-05-24 13:37:49 +00:00
committed by jpcgt
parent bb3b07455c c34c59f870
commit f7f7c54e5e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlatCAMObj.py
View File

@@ -1044,6 +1044,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
"tooldia": self.ui.tooldia_entry, "tooldia": self.ui.tooldia_entry,
"append": self.ui.append_text, "append": self.ui.append_text,
"prepend": self.ui.prepend_text, "prepend": self.ui.prepend_text,
"postprocess": self.ui.process_script,
"dwell": self.ui.dwell_cb, "dwell": self.ui.dwell_cb,
"dwelltime": self.ui.dwelltime_entry "dwelltime": self.ui.dwelltime_entry
}) })
@@ -1073,8 +1074,9 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
preamble = str(self.ui.prepend_text.get_value()) preamble = str(self.ui.prepend_text.get_value())
postamble = str(self.ui.append_text.get_value()) postamble = str(self.ui.append_text.get_value())
processor = str(self.ui.process_script.get_value())
self.export_gcode(filename, preamble=preamble, postamble=postamble) self.export_gcode(filename, preamble=preamble, postamble=postamble, processor=processor)
def dwell_generator(self, lines): def dwell_generator(self, lines):
""" """
@@ -1110,7 +1112,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
raise StopIteration raise StopIteration
def export_gcode(self, filename, preamble='', postamble=''): def export_gcode(self, filename, preamble='', postamble='', processor=''):
lines = StringIO(self.gcode) lines = StringIO(self.gcode)

11
ObjectUI.py
View File

@@ -196,6 +196,17 @@ class CNCObjectUI(ObjectUI):
self.append_text = FCTextArea() self.append_text = FCTextArea()
self.custom_box.addWidget(self.append_text) self.custom_box.addWidget(self.append_text)
processorlabel = QtGui.QLabel('Postprocessing-Script:')
processorlabel.setToolTip(
"Enter a Postprocessing Script here.\n"
"It gets applied to the G-Code after it\n"
"is generated."
)
self.custom_box.addWidget(processorlabel)
self.process_script = FCTextArea()
self.custom_box.addWidget(self.process_script)
# Dwell # Dwell
grid1 = QtGui.QGridLayout() grid1 = QtGui.QGridLayout()
self.custom_box.addLayout(grid1) self.custom_box.addLayout(grid1)