Merge https://bitbucket.org/jpcgt/flatcam/src/master into Port_to_Python3k
# Conflicts: # ObjectCollection.py
This commit is contained in:
commit
a6a26de0d3
@ -1641,7 +1641,8 @@ class App(QtCore.QObject):
|
|||||||
try:
|
try:
|
||||||
App.log.debug('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (
|
App.log.debug('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (
|
||||||
event.button, event.x, event.y, event.xdata, event.ydata))
|
event.button, event.x, event.y, 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))
|
self.clipboard.setText(self.defaults["point_clipboard_format"] % (event.xdata, event.ydata))
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
@ -1070,6 +1070,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
|
||||||
})
|
})
|
||||||
@ -1099,8 +1100,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):
|
||||||
"""
|
"""
|
||||||
@ -1136,7 +1138,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)
|
||||||
|
|
||||||
|
@ -69,7 +69,6 @@ class ObjectCollection():
|
|||||||
self.model = QtGui.QStandardItemModel(self.view)
|
self.model = QtGui.QStandardItemModel(self.view)
|
||||||
self.view.setModel(self.model)
|
self.view.setModel(self.model)
|
||||||
self.model.itemChanged.connect(self.on_item_changed)
|
self.model.itemChanged.connect(self.on_item_changed)
|
||||||
#self.view.setModel(self)
|
|
||||||
|
|
||||||
self.click_modifier = None
|
self.click_modifier = None
|
||||||
|
|
||||||
@ -162,7 +161,7 @@ class ObjectCollection():
|
|||||||
|
|
||||||
# Create the model item to insert into the QListView
|
# Create the model item to insert into the QListView
|
||||||
icon = QtGui.QIcon(self.icons[obj.kind])#self.icons["gerber"])
|
icon = QtGui.QIcon(self.icons[obj.kind])#self.icons["gerber"])
|
||||||
item = QtGui.QStandardItem(icon, str(name))
|
item = QtGui.QStandardItem(icon, name)
|
||||||
# Item is not editable, so that double click
|
# Item is not editable, so that double click
|
||||||
# does not allow cell value modification.
|
# does not allow cell value modification.
|
||||||
item.setEditable(False)
|
item.setEditable(False)
|
||||||
|
11
ObjectUI.py
11
ObjectUI.py
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user