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

Fix token replacement in extruder start and end g-codes

Browse source 
Don't perform the replacement in the global stack for these settings, but in the extruder stacks.

Fixes #2331.
This commit is contained in:
Ruben D 2017-09-03 16:41:02 +02:00
parent d18d9223a5
commit 3af37d5dbc
No known key found for this signature in database
GPG key ID: 6B42C9465E304A62
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -224,7 +224,18 @@ class StartSliceJob(Job):
material_instance_container = stack.findContainer({"type": "material"}) material_instance_container = stack.findContainer({"type": "material"})
settings = {}
for key in stack.getAllKeys(): for key in stack.getAllKeys():
settings[key] = stack.getProperty(key, "value")
Job.yieldThread()
settings["print_bed_temperature"] = settings["material_bed_temperature"] #Renamed settings.
settings["print_temperature"] = settings["material_print_temperature"]
settings["time"] = time.strftime("%H:%M:%S") #Some extra settings.
settings["date"] = time.strftime("%d-%m-%Y")
settings["day"] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][int(time.strftime("%w"))]
for key, value in settings.items():
# Do not send settings that are not settable_per_extruder. # Do not send settings that are not settable_per_extruder.
if not stack.getProperty(key, "settable_per_extruder"): if not stack.getProperty(key, "settable_per_extruder"):
continue continue
@ -233,6 +244,8 @@ class StartSliceJob(Job):
if key == "material_guid" and material_instance_container: if key == "material_guid" and material_instance_container:
# Also send the material GUID. This is a setting in fdmprinter, but we have no interface for it. # Also send the material GUID. This is a setting in fdmprinter, but we have no interface for it.
setting.value = str(material_instance_container.getMetaDataEntry("GUID", "")).encode("utf-8") setting.value = str(material_instance_container.getMetaDataEntry("GUID", "")).encode("utf-8")
elif key == "machine_extruder_start_code" or key == "machine_extruder_end_code":
setting.value = self._expandGcodeTokens(key, value, settings)
else: else:
setting.value = str(stack.getProperty(key, "value")).encode("utf-8") setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
Job.yieldThread() Job.yieldThread()
@ -278,7 +291,7 @@ class StartSliceJob(Job):
for key, value in settings.items(): #Add all submessages for each individual setting. for key, value in settings.items(): #Add all submessages for each individual setting.
setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings") setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings")
setting_message.name = key setting_message.name = key
if key == "machine_start_gcode" or key == "machine_end_gcode" or key == "machine_extruder_start_code" or key == "machine_extruder_end_code": #If it's a g-code message, use special formatting. if key == "machine_start_gcode" or key == "machine_end_gcode": #If it's a g-code message, use special formatting.
setting_message.value = self._expandGcodeTokens(key, value, settings) setting_message.value = self._expandGcodeTokens(key, value, settings)
else: else:
setting_message.value = str(value).encode("utf-8") setting_message.value = str(value).encode("utf-8")