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

Merge https://bitbucket.org/jpcgt/flatcam/src/master into Port_to_Python3k

Browse Source 
# Conflicts:
#	ObjectCollection.py
This commit is contained in:
Marius Stanciu
2018-05-30 20:38:43 +03:00
parent 4cf06b71e8 6f53d38338
commit a6a26de0d3
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlatCAMObj.py
View File

@@ -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)