GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 01:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_preheat_fields' of https://github.com/fieldOfView/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2020-03-09 13:02:02 +01:00
commit d041131f84
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,15 +209,15 @@ Item
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
Component.onCompleted: text:
{ {
if (!extruderTemperature.properties.value) if (!extruderTemperature.properties.value)
{ {
text = ""; return "";
} }
else else
{ {
text = extruderTemperature.properties.value; return extruderTemperature.properties.value;
} }
} }
} }

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

@ -193,22 +193,22 @@ Item
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
Component.onCompleted: text:
{ {
if (!bedTemperature.properties.value) if (!bedTemperature.properties.value)
{ {
text = ""; return "";
} }
if ((bedTemperature.resolve != "None" && bedTemperature.resolve) && (bedTemperature.stackLevels[0] != 0) && (bedTemperature.stackLevels[0] != 1)) 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 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 // we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this). // (if user has explicitly set this).
text = bedTemperature.resolve; return bedTemperature.resolve;
} }
else else
{ {
text = bedTemperature.properties.value; return bedTemperature.properties.value;
} }
} }
} }