q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes...

master
Gina Häußge 2013-01-04 11:08:19 +01:00
parent d102bdbfca
commit 2db1cff224
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
printer_webui/timelapse.py
View File

@ -95,8 +95,8 @@ class TimedTimelapse(Timelapse):
self.timerThread = None
def onPrintjobStarted(self):
Timelapse.onPrintjobStarted(self)
def onPrintjobStarted(self, filename):
Timelapse.onPrintjobStarted(self, filename)
if self.timerThread is not None:
return

5
printer_webui/util/comm.py
View File

@ -242,7 +242,10 @@ class MachineCom(object):
return self._gcodePos
def getPrintTime(self):
return time.time() - self._printStartTime100
if self._printStartTime100 == None:
return 0
else:
return time.time() - self._printStartTime100
def getPrintTimeRemainingEstimate(self):
if self._printStartTime100 == None or self.getPrintPos() < 200: