From: Jere Malinen <jeremmalinen@gmail.com>
Date: Sun, 13 Jun 2010 18:34:15 +0000 (+0300)
Subject: Fixed rounding.
X-Git-Tag: netstory-0.1.1~3
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=e48916f0aaf8eefe8cffcd664ea823451e7fa5d5;p=netstory

Fixed rounding.

Previously MB "rounding" was very invalid.
---

diff --git a/src/opt/netstory/netstory.py b/src/opt/netstory/netstory.py
index 30c7554..933398a 100644
--- a/src/opt/netstory/netstory.py
+++ b/src/opt/netstory/netstory.py
@@ -399,13 +399,12 @@ class TrafficRow:
         self.total_string = self.bytes_representation(self.total_bytes)
         
     def bytes_representation(self, number):
-        s = str(number)
-        if len(s) > 6:
-            s = '%s.%s MB' % (s[0:-6], s[-5])
-        elif len(s) > 3:
-            s = '%s kB' % (s[0:-3])
+        if number > 999999:
+            s = '%.1f MB' % round(number / 1000000.0, 1)
+        elif number > 999:
+            s = '%d kB' % round(number / 1000.0, 0)
         else:
-            s = '%s B' % (s)
+            s = '%d B' % (number)
         return s
         
     def add(self, other):