diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 10ac01f0..32c880d3 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1641,8 +1641,9 @@ class App(QtCore.QObject): try: App.log.debug('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % ( event.button, event.x, event.y, event.xdata, event.ydata)) - - self.clipboard.setText(self.defaults["point_clipboard_format"] % (event.xdata, event.ydata)) + modifiers = QtGui.QApplication.keyboardModifiers() + if modifiers == QtCore.Qt.ControlModifier: + self.clipboard.setText(self.defaults["point_clipboard_format"] % (event.xdata, event.ydata)) except Exception as e: App.log.debug("Outside plot?") diff --git a/FlatCAMObj.py b/FlatCAMObj.py index b6d2c92b..378d892a 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1070,6 +1070,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 }) @@ -1099,8 +1100,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): """ @@ -1136,7 +1138,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/ObjectCollection.py b/ObjectCollection.py index ccc6a6da..ecfd680f 100644 --- a/ObjectCollection.py +++ b/ObjectCollection.py @@ -69,7 +69,6 @@ class ObjectCollection(): self.model = QtGui.QStandardItemModel(self.view) self.view.setModel(self.model) self.model.itemChanged.connect(self.on_item_changed) - #self.view.setModel(self) self.click_modifier = None @@ -161,8 +160,8 @@ class ObjectCollection(): self.object_list.append(obj) # Create the model item to insert into the QListView - icon = QtGui.QIcon(self.icons[obj.kind]) # self.icons["gerber"]) - item = QtGui.QStandardItem(icon, str(name)) + icon = QtGui.QIcon(self.icons[obj.kind])#self.icons["gerber"]) + item = QtGui.QStandardItem(icon, name) # Item is not editable, so that double click # does not allow cell value modification. item.setEditable(False) diff --git a/ObjectUI.py b/ObjectUI.py index 2211126b..5a476b3b 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.process_script = FCTextArea() + self.custom_box.addWidget(self.process_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()