3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

getResolveOrValue has become obsolete now that stack.getProperty can return a resolve

Browse source
This commit is contained in:
Arjen Hiemstra 2017-04-04 17:41:43 +02:00
parent a16b5d73b6
commit d3d2bdfaeb
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cura/Settings/ExtruderManager.py
View file

@ -513,16 +513,16 @@ class ExtruderManager(QObject):
global_stack = Application.getInstance().getGlobalContainerStack() global_stack = Application.getInstance().getGlobalContainerStack()
resolved_value = global_stack.getProperty(key, "resolve") resolved_value = global_stack.getProperty(key, "resolve")
if resolved_value is not None: #if resolved_value is not None:
user_container = global_stack.findContainer({"type": "user"}) #user_container = global_stack.findContainer({"type": "user"})
quality_changes_container = global_stack.findContainer({"type": "quality_changes"}) #quality_changes_container = global_stack.findContainer({"type": "quality_changes"})
if user_container.hasProperty(key, "value") or quality_changes_container.hasProperty(key, "value"): #if user_container.hasProperty(key, "value") or quality_changes_container.hasProperty(key, "value"):
# Normal case ## Normal case
value = global_stack.getProperty(key, "value") #value = global_stack.getProperty(key, "value")
else: #else:
# We have a resolved value and we're using it because of no user and quality_changes value ## We have a resolved value and we're using it because of no user and quality_changes value
value = resolved_value #value = resolved_value
else: #else:
value = global_stack.getRawProperty(key, "value") #value = global_stack.getRawProperty(key, "value")
return value return resolved_value