Bed temperature is now either a resolved value or a global value.

Contributes to CURA-2007
This commit is contained in:
Jack Ha 2016-08-04 14:30:48 +02:00
parent aba027373b
commit 2402ba3d0e
6 changed files with 34 additions and 5 deletions

View file

@ -106,7 +106,16 @@ SettingItem
{
target: input
property: "text"
value: propertyProvider.properties.value
value: {
if (propertyProvider.properties.resolve != "None") {
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).
return (globalPropertyProvider.properties.value != null) ? globalPropertyProvider.properties.value : propertyProvider.properties.resolve;
} else {
return propertyProvider.properties.value;
}
}
when: !input.activeFocus
}
}