GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 09:49:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not try to handle resolve manually in StartSliceJob

Browse Source 
Since the container stacks should now take care of it
This commit is contained in:
Arjen Hiemstra 2017-04-06 17:50:43 +02:00
parent 6827849220
commit df25fa9345
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -230,20 +230,7 @@ class StartSliceJob(Job):
keys = stack.getAllKeys() keys = stack.getAllKeys()
settings = {} settings = {}
for key in keys: for key in keys:
# Use resolvement value if available, or take the value settings[key] = stack.getProperty(key, "value")
resolved_value = stack.getProperty(key, "resolve")
if resolved_value is not None:
# There is a resolvement value. Check if we need to use it.
user_container = stack.findContainer({"type": "user"})
quality_changes_container = stack.findContainer({"type": "quality_changes"})
if user_container.hasProperty(key,"value") or quality_changes_container.hasProperty(key,"value"):
# Normal case
settings[key] = stack.getProperty(key, "value")
else:
settings[key] = resolved_value
else:
# Normal case
settings[key] = stack.getProperty(key, "value")
Job.yieldThread() Job.yieldThread()
start_gcode = settings["machine_start_gcode"] start_gcode = settings["machine_start_gcode"]