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

Write out pre-heat button enabled condition

Browse Source 
It should be equivalent. This needs to be done because the line is getting long and I need to add additional checks for if the properties are even set.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-07 17:30:15 +01:00
parent 7cf81412ae
commit e9b30daad6
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resources/qml/PrintMonitor.qml
View File

@ -330,7 +330,26 @@ Column
text: preheatCountdownTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat") text: preheatCountdownTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat")
tooltip: catalog.i18nc("@tooltip of pre-heat", "Heat the bed in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the bed to heat up when you're ready to print.") tooltip: catalog.i18nc("@tooltip of pre-heat", "Heat the bed in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the bed to heat up when you're ready to print.")
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
enabled: printerConnected && (preheatCountdownTimer.running || (parseInt(preheatTemperatureInput.text) >= parseInt(bedTemperature.properties.minimum_value) && parseInt(preheatTemperatureInput.text) <= parseInt(bedTemperature.properties.maximum_value))) enabled:
{
if (!printerConnected)
{
return false; //Can't preheat if not connected.
}
if (preheatCountdownTimer.running)
{
return true; //Can always cancel if the timer is running.
}
if (parseInt(preheatTemperatureInput.text) < parseInt(bedTemperature.properties.minimum_value))
{
return false; //Target temperature too low.
}
if (parseInt(preheatTemperatureInput.text) > parseInt(bedTemperature.properties.maximum_value))
{
return false; //Target temperature too high.
}
return true; //Preconditions are met.
}
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottom: parent.bottom anchors.bottom: parent.bottom