From 40e8445f2de9a412ecbb20c7753026df0278cf29 Mon Sep 17 00:00:00 2001 From: Juan Pablo Caram Date: Mon, 31 Aug 2015 10:19:46 -0400 Subject: [PATCH] Added Prepend to G-Code to default settings. This solves #115. --- FlatCAMApp.py | 4 ++++ FlatCAMGUI.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 73fd2a48..d92b0284 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -205,6 +205,7 @@ class App(QtCore.QObject): "geometry_paintmargin": self.defaults_form.geometry_group.paintmargin_entry, "cncjob_plot": self.defaults_form.cncjob_group.plot_cb, "cncjob_tooldia": self.defaults_form.cncjob_group.tooldia_entry, + "cncjob_prepend": self.defaults_form.cncjob_group.prepend_text, "cncjob_append": self.defaults_form.cncjob_group.append_text } @@ -243,6 +244,7 @@ class App(QtCore.QObject): "geometry_paintmargin": 0.0, "cncjob_plot": True, "cncjob_tooldia": 0.016, + "cncjob_prepend": "", "cncjob_append": "", # Persistence @@ -323,6 +325,7 @@ class App(QtCore.QObject): "geometry_paintmargin": self.options_form.geometry_group.paintmargin_entry, "cncjob_plot": self.options_form.cncjob_group.plot_cb, "cncjob_tooldia": self.options_form.cncjob_group.tooldia_entry, + "cncjob_prepend": self.options_form.cncjob_group.prepend_text, "cncjob_append": self.options_form.cncjob_group.append_text } @@ -360,6 +363,7 @@ class App(QtCore.QObject): "geometry_paintmargin": 0.0, "cncjob_plot": True, "cncjob_tooldia": 0.016, + "cncjob_prepend": "", "cncjob_append": "" }) self.options.update(self.defaults) # Copy app defaults to project options diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index 888f0c0f..1e543694 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -748,7 +748,18 @@ class CNCJobOptionsGroupUI(OptionsGroupUI): ) self.layout.addWidget(self.export_gcode_label) - # Append text to Gerber + # Prepend to G-Code + prependlabel = QtGui.QLabel('Prepend to G-Code:') + prependlabel.setToolTip( + "Type here any G-Code commands you would\n" + "like to add at the beginning of the G-Code file." + ) + self.layout.addWidget(prependlabel) + + self.prepend_text = FCTextArea() + self.layout.addWidget(self.prepend_text) + + # Append text to G-Code appendlabel = QtGui.QLabel('Append to G-Code:') appendlabel.setToolTip( "Type here any G-Code commands you would\n"