pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added consistent formatting for print time, print time left and estimated print time

Browse source 
All times are now formatted according to <hours>:<minutes>:<seconds>. Also added formatting of current height

Closes #3
This commit is contained in:
Gina Häußge 2012-12-29 20:57:02 +01:00
parent 459a856556
commit 0fd8132a41
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Cura/webui/printer.py
View file

@ -4,6 +4,7 @@ __author__ = "Gina Häußge <osd@foosel.net>"
import time
import os
from threading import Thread
import datetime
import Cura.util.machineCom as machineCom
from Cura.util import gcodeInterpreter
@ -26,6 +27,12 @@ def getConnectionOptions():
"baudratePreference": baudratePref
}
def _getFormattedTimeDelta(d):
hours = d.seconds // 3600
minutes = (d.seconds % 3600) // 60
seconds = d.seconds % 60
return "%02d:%02d:%02d" % (hours, minutes, seconds)
class Printer():
def __init__(self):
# state
@ -179,27 +186,33 @@ class Printer():
if self.gcode is not None:
formattedPrintTime = None
if (self.printTime):
formattedPrintTime = "%02d:%02d" % (int(self.printTime / 60), int(self.printTime % 60))
formattedPrintTime = _getFormattedTimeDelta(datetime.timedelta(seconds=self.printTime))
formattedPrintTimeLeft = None
if (self.printTimeLeft):
formattedPrintTimeLeft = "%02d:%02d" % (int(self.printTimeLeft / 60), int(self.printTimeLeft % 60))
formattedPrintTimeLeft = _getFormattedTimeDelta(datetime.timedelta(minutes=self.printTimeLeft))
formattedPrintTimeEstimation = None
formattedFilament = None
if self.gcode:
if self.gcode.totalMoveTimeMinute:
formattedPrintTimeEstimation = _getFormattedTimeDelta(datetime.timedelta(minutes=self.gcode.totalMoveTimeMinute))
if self.gcode.extrusionAmount:
formattedFilament = "%.2fm %.2fg" % (self.gcode.extrusionAmount / 1000, self.gcode.calculateWeight() * 1000)
formattedCurrentZ = None
if self.currentZ:
formattedCurrentZ = "%.2f mm" % (self.currentZ)
data = {
"filename": self.filename,
"currentZ": self.currentZ,
"currentZ": formattedCurrentZ,
"line": self.progress,
"totalLines": len(self.gcodeList),
"printTime": formattedPrintTime,
"printTimeLeft": formattedPrintTimeLeft,
"filament": "%.2fm %.2fg" % (
self.gcode.extrusionAmount / 1000,
self.gcode.calculateWeight() * 1000
),
"estimatedPrintTime": "%02d:%02d" % (
int(self.gcode.totalMoveTimeMinute / 60),
int(self.gcode.totalMoveTimeMinute % 60)
)
"filament": formattedFilament,
"estimatedPrintTime": formattedPrintTimeEstimation
}
else:
data = None