[rhmessaging-commits] rhmessaging commits: r1920 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-04-15 20:57:44 -0400 (Tue, 15 Apr 2008)
New Revision: 1920

Modified:
   mgmt/cumin/python/cumin/charts.py
Log:
Widen charts slightly, and shorten million+ values

Modified: mgmt/cumin/python/cumin/charts.py
===================================================================
--- mgmt/cumin/python/cumin/charts.py	2008-04-16 00:47:10 UTC (rev 1919)
+++ mgmt/cumin/python/cumin/charts.py	2008-04-16 00:57:44 UTC (rev 1920)
@@ -11,7 +11,7 @@
 
 class TimeSeriesChart(object):
     def __init__(self, width, height):
-        self.width = width - 60
+        self.width = width - 40
         self.height = height - 20
         self.surface = ImageSurface(FORMAT_ARGB32, width, height)
         self.surface.set_device_offset(1.5, 5.5)
@@ -115,7 +115,9 @@
                 value = fraction * self.y_max - self.y_min
                 value = int(round(value + self.y_min))
 
-                if value > 10000:
+                if value >= 10000000:
+                    svalue = "%im" % int(round(value / 1000000.0, -1))
+                elif value >= 10000:
                     svalue = "%ik" % int(round(value / 1000.0, -1))
                 else:
                     svalue = str(value)