diff options
| author | kintel <kintel> | 2009-04-06 19:04:37 +0000 |
|---|---|---|
| committer | kintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2009-04-06 19:04:37 +0000 |
| commit | f23e16b84fce13675e9e59532c1d13a58fc4f2d5 (patch) | |
| tree | a5cf6ecb97ee0906d08984b9f8b39c00c487cd13 | |
| parent | 6abd0d161309096b5b74948049c3d087e973fd38 (diff) | |
| download | reprap-f23e16b84fce13675e9e59532c1d13a58fc4f2d5.tar.gz reprap-f23e16b84fce13675e9e59532c1d13a58fc4f2d5.zip | |
Print progress also on temperature changes
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@2770 cb376a5e-1013-0410-a455-b6b1f9ac8223
| -rw-r--r-- | trunk/users/metalab/python/metahost/BufferedSender.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/trunk/users/metalab/python/metahost/BufferedSender.py b/trunk/users/metalab/python/metahost/BufferedSender.py index 0eaa0d79..cf048506 100644 --- a/trunk/users/metalab/python/metahost/BufferedSender.py +++ b/trunk/users/metalab/python/metahost/BufferedSender.py @@ -46,6 +46,17 @@ class BufferedSender: if self.verbose >= BufferedSender.DEBUG: print("Total size: " + str(self.totalsize) + " bytes"); + def printProgress(self): + if self.totalsent > 10000: + remainingtime = (time() - self.starttime) / self.totalsent * (self.totalsize - self.totalsent) + minutes = "%3d" % (int(remainingtime / 60)) + seconds = "%02d" % (remainingtime % 60) + else: + minutes = "???" + seconds = "??" + print "(%4.1f%%) ETA %s:%s T: %3d\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10" % (100.0*self.totalsent/self.totalsize, minutes, seconds, self.currtemp), + + def play(self): if self.verbose >= BufferedSender.NORMAL: print "Printing ", for iter in self.iterators: @@ -82,15 +93,8 @@ class BufferedSender: size = self.bufferedlengths.pop(0) self.totalsent += size self.bufferavail += size - if self.totalsent > 10000: - remainingtime = (time() - self.starttime) / self.totalsent * (self.totalsize - self.totalsent) - minutes = "%3d" % (int(remainingtime / 60)) - seconds = "%02d" % (remainingtime % 60) - else: - minutes = "???" - seconds = "??" if self.verbose >= BufferedSender.NORMAL: - print "(%4.1f%%) ETA %s:%s T: %3d\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10\10" % (100.0*self.totalsent/self.totalsize, minutes, seconds, self.currtemp), + self.printProgress() sys.stdout.flush() elif recvline.startswith("error: "): @@ -99,6 +103,7 @@ class BufferedSender: print("\n" + recvline) elif recvline.startswith("T:"): self.currtemp = int(recvline[2:]) + self.printProgress() else: print("\nunexpected serial line: " + recvline) except StopIteration: |