mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-09 07:56:22 -06:00
Resolve formula in Keep or Discard dialog
CURA-10111
This commit is contained in:
parent
5c65ba5058
commit
16c64014b2
2 changed files with 23 additions and 19 deletions
|
@ -118,12 +118,14 @@ class UserChangesModel(ListModel):
|
|||
if original_value is not None:
|
||||
break
|
||||
|
||||
item_to_add = {"key": setting_key,
|
||||
"label": label,
|
||||
"user_value": str(user_changes.getProperty(setting_key, "value")),
|
||||
"original_value": str(original_value),
|
||||
"extruder": "",
|
||||
"category": category_label}
|
||||
item_to_add = {
|
||||
"key": setting_key,
|
||||
"label": label,
|
||||
"user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)),
|
||||
"original_value": str(original_value),
|
||||
"extruder": "",
|
||||
"category": category_label,
|
||||
}
|
||||
|
||||
if stack != global_stack:
|
||||
item_to_add["extruder"] = stack.getName()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue