3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
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
renderType: Text.NativeRendering
Component.onCompleted:
text:
{
if (!extruderTemperature.properties.value)
{
text = "";
return "";
}
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
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;
}
}
}