From 9b63f1237ab53cfead631b6d042ce43b62f23314 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 1 Mar 2017 09:48:26 +0100 Subject: [PATCH] Instead of the setting function we now show the calculated value for settingoverride dialog CURA-3221 --- cura/Settings/UserChangesModel.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cura/Settings/UserChangesModel.py b/cura/Settings/UserChangesModel.py index 48296b9907..81dfe5809b 100644 --- a/cura/Settings/UserChangesModel.py +++ b/cura/Settings/UserChangesModel.py @@ -5,6 +5,7 @@ from UM.Application import Application from cura.Settings.ExtruderManager import ExtruderManager from UM.Settings.ContainerRegistry import ContainerRegistry from UM.i18n import i18nCatalog +from UM.Settings.SettingFunction import SettingFunction import os @@ -98,9 +99,13 @@ class UserChangesModel(ListModel): if original_value is not None: break + # If a value is a function, ensure it's called with the stack it's in. + if isinstance(original_value, SettingFunction): + original_value = original_value(stack) + item_to_add = {"key": setting_key, "label": label, - "user_value": user_changes.getProperty(setting_key, "value"), + "user_value": str(user_changes.getProperty(setting_key, "value")), "original_value": str(original_value), "extruder": "", "category": category_label}