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

- updated the GCode header

Browse Source
This commit is contained in:
Marius Stanciu
2022-05-05 18:30:16 +03:00
committed by Marius
parent 181a392cec
commit a623f20cf5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM Evo beta
- made sure that the draw color in Editors is inverted for the dark mode - made sure that the draw color in Editors is inverted for the dark mode
- added a hack so the dark stylesheet for QWidget is reapplied if that Qwidget is removed (I don't know why it is lost in the first time) - added a hack so the dark stylesheet for QWidget is reapplied if that Qwidget is removed (I don't know why it is lost in the first time)
- when exiting an Editor with a sub-tool active the cursor data display feature is removed - when exiting an Editor with a sub-tool active the cursor data display feature is removed
- updated the GCode header
4.05.2020 4.05.2020

10
appObjects/CNCJobObject.py
View File

@@ -912,7 +912,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
pass pass
if marlin is True: if marlin is True:
gcode += ';Marlin(Repetier) G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \ gcode += ';Marlin(Repetier) G-code generated by FlatCAM Evo v%s - Version Date: %s\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n' (str(self.app.version), str(self.app.version_date)) + '\n'
gcode += ';Name: ' + str(self.obj_options['name']) + '\n' gcode += ';Name: ' + str(self.obj_options['name']) + '\n'
@@ -921,7 +921,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += ';Units: ' + self.units.upper() + '\n' + "\n" gcode += ';Units: ' + self.units.upper() + '\n' + "\n"
gcode += ';Created on ' + time_str + '\n' + '\n' gcode += ';Created on ' + time_str + '\n' + '\n'
elif hpgl is True: elif hpgl is True:
gcode += 'CO "HPGL CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s' % \ gcode += 'CO "HPGL code generated by FlatCAM Evo v%s - Version Date: %s' % \
(str(self.app.version), str(self.app.version_date)) + '";\n' (str(self.app.version), str(self.app.version_date)) + '";\n'
gcode += 'CO "Name: ' + str(self.obj_options['name']) + '";\n' gcode += 'CO "Name: ' + str(self.obj_options['name']) + '";\n'
@@ -930,7 +930,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += 'CO "Units: ' + self.units.upper() + '";\n' gcode += 'CO "Units: ' + self.units.upper() + '";\n'
gcode += 'CO "Created on ' + time_str + '";\n' gcode += 'CO "Created on ' + time_str + '";\n'
elif probe_pp is True: elif probe_pp is True:
gcode += '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \ gcode += '(G-code generated by FlatCAM Evo v%s - Version Date: %s)\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n' (str(self.app.version), str(self.app.version_date)) + '\n'
gcode += '(This GCode tool change is done by using a Probe.)\n' \ gcode += '(This GCode tool change is done by using a Probe.)\n' \
@@ -945,7 +945,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += '(Units: ' + self.units.upper() + ')\n' + "\n" gcode += '(Units: ' + self.units.upper() + ')\n' + "\n"
gcode += '(Created on ' + time_str + ')\n' + '\n' gcode += '(Created on ' + time_str + ')\n' + '\n'
elif nccad_pp is True: elif nccad_pp is True:
gcode += ';NCCAD9 G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \ gcode += ';NCCAD9 G-code generated by FlatCAM Evo v%s - Version Date: %s\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n' (str(self.app.version), str(self.app.version_date)) + '\n'
gcode += ';Name: ' + str(self.obj_options['name']) + '\n' gcode += ';Name: ' + str(self.obj_options['name']) + '\n'
@@ -954,7 +954,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
gcode += ';Units: ' + self.units.upper() + '\n' + "\n" gcode += ';Units: ' + self.units.upper() + '\n' + "\n"
gcode += ';Created on ' + time_str + '\n' + '\n' gcode += ';Created on ' + time_str + '\n' + '\n'
else: else:
gcode += '%sG-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s%s\n' % \ gcode += '%sG-code generated by FlatCAM Evo v%s - Version Date: %s%s\n' % \
(start_comment, str(self.app.version), str(self.app.version_date), stop_comment) + '\n' (start_comment, str(self.app.version), str(self.app.version_date), stop_comment) + '\n'
gcode += '%sName: ' % start_comment + str(self.obj_options['name']) + '%s\n' % stop_comment gcode += '%sName: ' % start_comment + str(self.obj_options['name']) + '%s\n' % stop_comment