From bdc2d8cc593381c3d5d46362558effc23c030f0f Mon Sep 17 00:00:00 2001 From: Jakob Staudt Date: Thu, 24 May 2018 11:52:02 +0200 Subject: [PATCH 1/4] Added postprocessing GUI and Code --- FlatCAMObj.py | 6 ++++-- ObjectUI.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index f37ff471..89997ef8 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1044,6 +1044,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): "tooldia": self.ui.tooldia_entry, "append": self.ui.append_text, "prepend": self.ui.prepend_text, + "postprocess": self.ui.process_script, "dwell": self.ui.dwell_cb, "dwelltime": self.ui.dwelltime_entry }) @@ -1073,8 +1074,9 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): preamble = str(self.ui.prepend_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): """ @@ -1110,7 +1112,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): raise StopIteration - def export_gcode(self, filename, preamble='', postamble=''): + def export_gcode(self, filename, preamble='', postamble='', processor=''): lines = StringIO(self.gcode) diff --git a/ObjectUI.py b/ObjectUI.py index 1bf20bf7..1e80be65 100644 --- a/ObjectUI.py +++ b/ObjectUI.py @@ -196,6 +196,17 @@ class CNCObjectUI(ObjectUI): self.append_text = FCTextArea() 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.processing_script = FCTextArea() + self.custom_box.addWidget(self.processing_script) + + # Dwell grid1 = QtGui.QGridLayout() self.custom_box.addLayout(grid1) @@ -814,4 +825,4 @@ class GerberObjectUI(ObjectUI): # # # if __name__ == '__main__': -# main() \ No newline at end of file +# main() From 6877d0cd9b551bceb76f0cff24183be2e75765a4 Mon Sep 17 00:00:00 2001 From: Jakob Staudt Date: Thu, 24 May 2018 11:57:42 +0200 Subject: [PATCH 2/4] Added postprocessing GUI and Code --- FlatCAMObj.py | 2 +- ObjectUI.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 89997ef8..b8c12945 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1074,7 +1074,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): preamble = str(self.ui.prepend_text.get_value()) postamble = str(self.ui.append_text.get_value()) - processor = str(self.ui.process_script.get_value()) + processor = str(self.ui.process_script.get_value()) self.export_gcode(filename, preamble=preamble, postamble=postamble, processor=processor) diff --git a/ObjectUI.py b/ObjectUI.py index 1e80be65..611a8bc4 100644 --- a/ObjectUI.py +++ b/ObjectUI.py @@ -203,8 +203,8 @@ class CNCObjectUI(ObjectUI): "is generated." ) self.custom_box.addWidget(processorlabel) - self.processing_script = FCTextArea() - self.custom_box.addWidget(self.processing_script) + self.process_script = FCTextArea() + self.custom_box.addWidget(self.process_script) # Dwell From 20bc6b4da5894ccf5fd1db9d5627e53a151188d2 Mon Sep 17 00:00:00 2001 From: Jakob Staudt Date: Thu, 24 May 2018 10:04:47 +0000 Subject: [PATCH 3/4] Fixed Indentation Error in line 1077 --- FlatCAMObj.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index b8c12945..bea692b5 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1074,7 +1074,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): preamble = str(self.ui.prepend_text.get_value()) postamble = str(self.ui.append_text.get_value()) - processor = str(self.ui.process_script.get_value()) + processor = str(self.ui.process_script.get_value()) self.export_gcode(filename, preamble=preamble, postamble=postamble, processor=processor) From c34c59f8704f2b0447b22f12b9f98129d08051b3 Mon Sep 17 00:00:00 2001 From: Jakob Staudt Date: Thu, 24 May 2018 10:16:48 +0000 Subject: [PATCH 4/4] Changed Indentation to Spaces --- FlatCAMObj.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlatCAMObj.py b/FlatCAMObj.py index bea692b5..56a4e695 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1044,7 +1044,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): "tooldia": self.ui.tooldia_entry, "append": self.ui.append_text, "prepend": self.ui.prepend_text, - "postprocess": self.ui.process_script, + "postprocess": self.ui.process_script, "dwell": self.ui.dwell_cb, "dwelltime": self.ui.dwelltime_entry }) @@ -1074,7 +1074,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): preamble = str(self.ui.prepend_text.get_value()) postamble = str(self.ui.append_text.get_value()) - processor = str(self.ui.process_script.get_value()) + processor = str(self.ui.process_script.get_value()) self.export_gcode(filename, preamble=preamble, postamble=postamble, processor=processor)