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

Instead of the setting function we now show the calculated value for settingoverride dialog

Browse source 
CURA-3221
This commit is contained in:
Jaime van Kessel 2017-03-01 09:48:26 +01:00
parent af21146fef
commit 9b63f1237a
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/UserChangesModel.py
View file

@ -5,6 +5,7 @@ from UM.Application import Application
from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderManager import ExtruderManager
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Settings.SettingFunction import SettingFunction
import os import os
@ -98,9 +99,13 @@ class UserChangesModel(ListModel):
if original_value is not None: if original_value is not None:
break 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, item_to_add = {"key": setting_key,
"label": label, "label": label,
"user_value": user_changes.getProperty(setting_key, "value"), "user_value": str(user_changes.getProperty(setting_key, "value")),
"original_value": str(original_value), "original_value": str(original_value),
"extruder": "", "extruder": "",
"category": category_label} "category": category_label}