3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix GcodeStartEndFormatter to use fallback values

Browse source 
CURA-5901

Use values from the global stack (if exist) as fallback values.
This commit is contained in:
Lipu Fei 2018-11-27 09:49:35 +01:00
parent 2e81b97623
commit bd42136712
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -66,11 +66,19 @@ class GcodeStartEndFormatter(Formatter):
return "{" + key + "}" return "{" + key + "}"
key = key_fragments[0] key = key_fragments[0]
try:
return kwargs[str(extruder_nr)][key] default_value_str = "{" + key + "}"
except KeyError: value = default_value_str
# "-1" is global stack, and if the setting value exists in the global stack, use it as the fallback value.
if key in kwargs["-1"]:
value = kwargs["-1"]
if key in kwargs[str(extruder_nr)]:
value = kwargs[str(extruder_nr)][key]
if value == default_value_str:
Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key) Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key)
return "{" + key + "}"
return value
## Job class that builds up the message of scene data to send to CuraEngine. ## Job class that builds up the message of scene data to send to CuraEngine.