mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-11 08:47:50 -06:00
Instead of the setting function we now show the calculated value for settingoverride dialog
CURA-3221
This commit is contained in:
parent
af21146fef
commit
9b63f1237a
1 changed files with 6 additions and 1 deletions
|
@ -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}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue