[rhmessaging-commits] rhmessaging commits: r3898 - mgmt/newdata/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-04-07 14:19:35 -0400 (Wed, 07 Apr 2010)
New Revision: 3898

Modified:
   mgmt/newdata/cumin/python/cumin/stat.py
Log:
Fix y axis labels for flash charts

Modified: mgmt/newdata/cumin/python/cumin/stat.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/stat.py	2010-04-07 15:00:47 UTC (rev 3897)
+++ mgmt/newdata/cumin/python/cumin/stat.py	2010-04-07 18:19:35 UTC (rev 3898)
@@ -767,20 +767,22 @@
                     svalue = str(value)
 
                 label["text"] = svalue
-            else:
-                label["text"] = ""
-            label["y"] = int(i * y_step)
+                label["y"] = int(i * y_step)
+                labels.append(label)
 
-            labels.append(label)
         return labels
 
     def get_y_axis(self, max_value, min_value):
-        y_intervals = 6
         absy = max_value - min_value
+        y_intervals = min(6, absy)
+
         y_steps = int(absy / y_intervals)
+        y_label_steps = 2
+        if absy <= 2:
+            y_label_steps = 1
 
-        if int(max_value) < 3:
-            y_steps = 3
+        #if int(max_value) < 3:
+        #    y_steps = 3
 
         # .swf won't show grid lines without a y_axis on the left
         y_axis = {
@@ -798,7 +800,7 @@
             "tick-length": 0,
             "stroke": 1,
             "colour": "#BBBBBB",
-            "labels": {"colour": "#AAAAAA", "labels": self.get_y_labels(absy, y_intervals, 2)}}
+            "labels": {"colour": "#AAAAAA", "labels": self.get_y_labels(absy, y_intervals, y_label_steps)}}
 
         return y_axis, y_axis_right