GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-19 12:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into use-proper-gradualflow_version

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-03-07 11:51:55 +01:00 committed by GitHub
commit d73457434b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/PrintMonitor.qml
View File

@ -132,8 +132,6 @@ ScrollView
key: "material_bed_temperature"
watchedProperties: ["value", "minimum_value", "maximum_value", "resolve"]
storeIndex: 0
property var resolve: Cura.MachineManager.activeStack != Cura.MachineManager.activeMachine ? properties.resolve : "None"
}
UM.SettingPropertyProvider

2
resources/qml/PrinterOutput/ExtruderBox.qml
View File

@ -25,8 +25,6 @@ Item
key: "material_print_temperature"
watchedProperties: ["value", "minimum_value", "maximum_value", "resolve"]
storeIndex: 0
property var resolve: Cura.MachineManager.activeStack != Cura.MachineManager.activeMachine ? properties.resolve : "None"
}
Rectangle

12
resources/qml/PrinterOutput/HeatedBedBox.qml
View File

@ -199,17 +199,7 @@ Item
{
return "";
}
if ((bedTemperature.resolve != "None" && bedTemperature.resolve) && (bedTemperature.stackLevels[0] != 0) && (bedTemperature.stackLevels[0] != 1))
{
// 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 bedTemperature.resolve;
}
else
{
return bedTemperature.properties.value;
}
return bedTemperature.properties.value;
}
}
}