3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CURA-5220 Skip storing the settings in the GCode if they already are.

Browse source
This commit is contained in:
Diego Prado Gesto 2018-04-12 11:49:38 +02:00
parent b7b48927c2
commit 2d30315ecf
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/GCodeWriter/GCodeWriter.py
View file

@ -42,6 +42,8 @@ class GCodeWriter(MeshWriter):
re.escape("\r"): "\\r" # Carriage return. Windows users may need this for visualisation in their editors. re.escape("\r"): "\\r" # Carriage return. Windows users may need this for visualisation in their editors.
} }
_setting_keyword = ";SETTING_"
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@ -69,11 +71,15 @@ class GCodeWriter(MeshWriter):
return False return False
gcode_list = gcode_dict.get(active_build_plate, None) gcode_list = gcode_dict.get(active_build_plate, None)
if gcode_list is not None: if gcode_list is not None:
has_settings = False
for gcode in gcode_list: for gcode in gcode_list:
if gcode[:len(self._setting_keyword)] == self._setting_keyword:
has_settings = True
stream.write(gcode) stream.write(gcode)
# Serialise the current container stack and put it at the end of the file. # Serialise the current container stack and put it at the end of the file.
settings = self._serialiseSettings(Application.getInstance().getGlobalContainerStack()) if not has_settings:
stream.write(settings) settings = self._serialiseSettings(Application.getInstance().getGlobalContainerStack())
stream.write(settings)
return True return True
return False return False
@ -108,7 +114,7 @@ class GCodeWriter(MeshWriter):
container_registry = self._application.getContainerRegistry() container_registry = self._application.getContainerRegistry()
quality_manager = self._application.getQualityManager() quality_manager = self._application.getQualityManager()
prefix = ";SETTING_" + str(GCodeWriter.version) + " " # The prefix to put before each line. prefix = self._setting_keyword + str(GCodeWriter.version) + " " # The prefix to put before each line.
prefix_length = len(prefix) prefix_length = len(prefix)
quality_type = stack.quality.getMetaDataEntry("quality_type") quality_type = stack.quality.getMetaDataEntry("quality_type")