3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rename preheatCountdownTimer to preheatUpdateTimer

Browse source 
It is a timer that triggers every 100ms to update the state of the pre-heating process, after all.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-16 10:47:54 +01:00
parent 3cc11ecae5
commit d363736fdd
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/PrintMonitor.qml
View file

@ -280,7 +280,7 @@ Column
Timer
{
id: preheatCountdownTimer
id: preheatUpdateTimer
interval: 100 //Update every 100ms. You want to update every 1s, but then you have one timer for the updating running out of sync with the actual date timer and you might skip seconds.
running: false
repeat: true
@ -331,7 +331,7 @@ Column
{
return false; //Printer is in a state where it can't react to pre-heating.
}
if (preheatCountdownTimer.running)
if (preheatUpdateTimer.running)
{
return true; //Can always cancel if the timer is running.
}
@ -423,23 +423,23 @@ Column
}
}
font: UM.Theme.getFont("action_button")
text: preheatCountdownTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat")
text: preheatUpdateTimer.running ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat")
}
}
}
onClicked:
{
if (!preheatCountdownTimer.running)
if (!preheatUpdateTimer.running)
{
connectedPrinter.preheatBed(preheatTemperatureInput.text, connectedPrinter.preheatBedTimeout);
preheatCountdownTimer.start();
preheatCountdownTimer.update(); //Update once before the first timer is triggered.
preheatUpdateTimer.start();
preheatUpdateTimer.update(); //Update once before the first timer is triggered.
}
else
{
connectedPrinter.cancelPreheatBed();
preheatCountdownTimer.update();
preheatUpdateTimer.update();
}
}