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

Don't disable pre-heat text if temperature is invalid

Browse source 
Otherwise you can't change the temperature to make it valid again...

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-16 14:17:13 +01:00
parent 84f695821d
commit 253b4bce03
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
resources/qml/PrintMonitor.qml
View file

@ -187,7 +187,22 @@ Column
{ {
id: preheatTemperatureControl id: preheatTemperatureControl
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : UM.Theme.getColor("setting_validation_ok") color: !enabled ? UM.Theme.getColor("setting_control_disabled") : UM.Theme.getColor("setting_validation_ok")
enabled: preheatButton.enabled enabled:
{
if (connectedPrinter == null)
{
return false; //Can't preheat if not connected.
}
if (!connectedPrinter.acceptsCommands)
{
return false; //Not allowed to do anything.
}
if (connectedPrinter.jobState == "printing" || connectedPrinter.jobState == "pre_print" || connectedPrinter.jobState == "resuming" || connectedPrinter.jobState == "pausing" || connectedPrinter.jobState == "paused" || connectedPrinter.jobState == "error" || connectedPrinter.jobState == "offline")
{
return false; //Printer is in a state where it can't react to pre-heating.
}
return true;
}
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : mouseArea.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border") border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : mouseArea.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
anchors.left: parent.left anchors.left: parent.left
@ -305,17 +320,9 @@ Column
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
enabled: enabled:
{ {
if (connectedPrinter == null) if (!preheatTemperatureControl.enabled)
{ {
return false; //Can't preheat if not connected. return false; //Not connected, not authenticated or printer is busy.
}
if (!connectedPrinter.acceptsCommands)
{
return false; //Not allowed to do anything.
}
if (connectedPrinter.jobState == "printing" || connectedPrinter.jobState == "pre_print" || connectedPrinter.jobState == "resuming" || connectedPrinter.jobState == "pausing" || connectedPrinter.jobState == "paused" || connectedPrinter.jobState == "error" || connectedPrinter.jobState == "offline")
{
return false; //Printer is in a state where it can't react to pre-heating.
} }
if (preheatUpdateTimer.running) if (preheatUpdateTimer.running)
{ {