From d07649fc596527de87264b055e385ef782d4db2f Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 28 Feb 2020 12:27:57 +0100 Subject: [PATCH] Fix values in print monitor preheat fields Contributes to #7172 --- resources/qml/PrinterOutput/ExtruderBox.qml | 6 +++--- resources/qml/PrinterOutput/HeatedBedBox.qml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml index 9825c705d5..f2dc791651 100644 --- a/resources/qml/PrinterOutput/ExtruderBox.qml +++ b/resources/qml/PrinterOutput/ExtruderBox.qml @@ -209,15 +209,15 @@ Item anchors.verticalCenter: parent.verticalCenter renderType: Text.NativeRendering - Component.onCompleted: + text: { if (!extruderTemperature.properties.value) { - text = ""; + return ""; } else { - text = extruderTemperature.properties.value; + return extruderTemperature.properties.value; } } } diff --git a/resources/qml/PrinterOutput/HeatedBedBox.qml b/resources/qml/PrinterOutput/HeatedBedBox.qml index 77421c8aad..2e3e319c89 100644 --- a/resources/qml/PrinterOutput/HeatedBedBox.qml +++ b/resources/qml/PrinterOutput/HeatedBedBox.qml @@ -193,22 +193,22 @@ Item anchors.verticalCenter: parent.verticalCenter renderType: Text.NativeRendering - Component.onCompleted: + text: { if (!bedTemperature.properties.value) { - text = ""; + 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). - text = bedTemperature.resolve; + return bedTemperature.resolve; } else { - text = bedTemperature.properties.value; + return bedTemperature.properties.value; } } }