3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Progress of firmware update now works correctly

Browse source
This commit is contained in:
Jaime van Kessel 2015-04-17 13:31:02 +02:00
parent cc9e67533c
commit 5133d0b2a1
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
FirmwareUpdateWindow.qml
View file

@ -9,7 +9,7 @@ Rectangle
Text Text
{ {
text: "Updating firmware" text: manager.progress == 0 ? "Starting firmware update, may take a while.": manager.progress > 99 ? "Firmware update completed.": "Updating firmware."
} }
ProgressBar ProgressBar
{ {

3
PrinterConnection.py
View file

@ -410,7 +410,8 @@ class PrinterConnection(SignalEmitter):
progressChanged = Signal() progressChanged = Signal()
def setProgress(self, progress,max_progress = 100): def setProgress(self, progress,max_progress = 100):
self._progress = progress self._progress = progress / max_progress * 100 #Convert to scale of 0-100
#self._progress = progress
self.progressChanged.emit(self._progress, self._serial_port) self.progressChanged.emit(self._progress, self._serial_port)
def cancelPrint(self): def cancelPrint(self):