GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 20:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "For discard changed window retrieve data from setting "value" property instead of "resolve""

Browse Source 
This reverts commit a2e0f4d64fcab35e0eeada795a20b725480013eb.
This commit is contained in:
ChrisTerBeke 2017-09-27 14:16:56 +02:00
parent 035a851eb0
commit f5310ad2ff
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Settings/GlobalStack.py
View File

@ -89,11 +89,10 @@ class GlobalStack(CuraContainerStack):
# #
# \param key The setting key to get the property of. # \param key The setting key to get the property of.
# \param property_name The property to get the value of. # \param property_name The property to get the value of.
# \param skip_container The container ID to skip.
# #
# \return The value of the property for the specified setting, or None if not found. # \return The value of the property for the specified setting, or None if not found.
@override(ContainerStack) @override(ContainerStack)
def getProperty(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None, skip_container: str = None) -> Any: def getProperty(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> Any:
if not self.definition.findDefinitions(key = key): if not self.definition.findDefinitions(key = key):
return None return None
@ -122,7 +121,7 @@ class GlobalStack(CuraContainerStack):
else: else:
Logger.log("e", "Setting {setting} has limit_to_extruder but is not settable per extruder!", setting = key) Logger.log("e", "Setting {setting} has limit_to_extruder but is not settable per extruder!", setting = key)
result = super().getProperty(key, property_name, context, skip_container) result = super().getProperty(key, property_name, context)
context.popContainer() context.popContainer()
return result return result

8
cura/Settings/UserChangesModel.py
View File

@ -90,11 +90,9 @@ class UserChangesModel(ListModel):
for container in containers: for container in containers:
if stack == global_stack: if stack == global_stack:
resolve = global_stack.getProperty(setting_key, "resolve")
#Find default value without checking user changed settings. if resolve is not None:
default_value = global_stack.getProperty(setting_key, "value", skip_container = user_changes.getId()) original_value = resolve
if default_value is not None:
original_value = default_value
break break
original_value = container.getProperty(setting_key, "value") original_value = container.getProperty(setting_key, "value")