From f5310ad2ff7d3cf1bf05c4ad49c864ed3b2d5b35 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 27 Sep 2017 14:16:56 +0200 Subject: [PATCH] Revert "For discard changed window retrieve data from setting "value" property instead of "resolve"" This reverts commit a2e0f4d64fcab35e0eeada795a20b725480013eb. --- cura/Settings/GlobalStack.py | 5 ++--- cura/Settings/UserChangesModel.py | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index cfab45bfed..bee82e2272 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -89,11 +89,10 @@ class GlobalStack(CuraContainerStack): # # \param key The setting key to get the property 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. @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): return None @@ -122,7 +121,7 @@ class GlobalStack(CuraContainerStack): else: 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() return result diff --git a/cura/Settings/UserChangesModel.py b/cura/Settings/UserChangesModel.py index fbbd721f9f..8b61186650 100644 --- a/cura/Settings/UserChangesModel.py +++ b/cura/Settings/UserChangesModel.py @@ -90,11 +90,9 @@ class UserChangesModel(ListModel): for container in containers: if stack == global_stack: - - #Find default value without checking user changed settings. - default_value = global_stack.getProperty(setting_key, "value", skip_container = user_changes.getId()) - if default_value is not None: - original_value = default_value + resolve = global_stack.getProperty(setting_key, "resolve") + if resolve is not None: + original_value = resolve break original_value = container.getProperty(setting_key, "value")