visage-app 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/visage-app/public/javascripts/graph.js

@@ -89,38 +89,41 @@ function formatSeriesLabel(labels) {
     return name.trim()
 }
 
-function formatValue(value, places) {
-  var places = places ? places : 0
-  switch(true) {
-    case (Math.abs(value) > 1125899906842624):
-      var label = value / 1125899906842624,
-          unit  = 'P';
-      break
-    case (Math.abs(value) > 1099511627776):
-      var label = value / 1099511627776,
-          unit  = 'T';
-      break
-    case (Math.abs(value) > 1073741824):
-      var label = value / 1073741824,
-          unit  = 'G';
-      break
-    case (Math.abs(value) > 1048576):
-      var label = value / 1048576,
-          unit  = 'M';
-      break
-    case (Math.abs(value) > 1024):
-      var label = value / 1024,
-          unit  = 'K';
-      break
-    default:
-      var label = value,
-          unit  = '';
-      break
-  }
-
-  var rounded = label.round(places)
-
-  return rounded + unit
+function formatValue(value, options) {
+    var precision = options.precision,
+        min       = options.min,
+        max       = options.max;
+
+    switch(true) {
+        case (Math.abs(max) > 1125899906842624):
+            var label = value / 1125899906842624,
+                unit  = 'P';
+            break
+        case (Math.abs(max) > 1099511627776):
+            var label = value / 1099511627776,
+                unit  = 'T';
+            break
+        case (Math.abs(max) > 1073741824):
+            var label = value / 1073741824,
+                unit  = 'G';
+            break
+        case (Math.abs(max) > 1048576):
+            var label = value / 1048576,
+                unit  = 'M';
+            break
+        case (Math.abs(max) > 1024):
+            var label = value / 1024,
+                unit  = 'K';
+            break
+        default:
+            var label = value,
+                unit  = '';
+            break
+    }
+
+    var rounded = label.round(precision)
+
+    return rounded + unit
 }
 
 function formatDate(d) {
@@ -245,7 +248,7 @@ var visageGraph = new Class({
                 }, this);
 
                 /* Reset the zoom */
-                this.chart.toolbar.remove('zoom');
+                //this.chart.toolbar.remove('zoom');
                 this.chart.xAxis.concat(this.chart.yAxis).each(function(axis) {
                     axis.setExtremes(null,null,false);
                 });
@@ -286,21 +289,46 @@ var visageGraph = new Class({
 
         return series
     },
+    getSeriesMinMax: function(series) {
+        var min, max;
+
+        series.each(function(set) {
+            values = set.data.map(function(point) {
+                var value = point[1];
+                return value
+            });
+
+            var setMin = values.min()
+            var setMax = values.max()
+
+            if ($chk(min)) {
+                min = min > setMin ? setMin : min
+            } else {
+                min = setMin
+            }
+
+            if ($chk(max)) {
+                max = max < setMax ? setMax : max
+            } else {
+                max = setMax
+            }
+        });
+
+        return {'min': min, 'max': max};
+    },
     drawChart: function() {
         var series  = this.series,
             title   = this.graphName(),
             element = this.parentElement,
             ytitle  = formatPluginName(this.options.plugin),
-            max     = 0
+            min,
+            max;
 
         /* Get the maximum value across all sets.
          * Used later on to determine the decimal place in the label. */
-        series.each(function(set) {
-            var setMax = set.data.max()
-            if ( setMax > max ) {
-              max = setMax
-            }
-        });
+        meta = this.getSeriesMinMax(series);
+        var min = meta.min,
+            max = meta.max;
 
         this.chart = new Highcharts.Chart({
             chart: {
@@ -349,19 +377,25 @@ var visageGraph = new Class({
               title: {
                 text: ytitle
               },
-              maxPadding: 0,
-              plotLines: [{
-                width: 0.5,
-              }],
+              startOnTick: false,
+              minPadding:  0.065,
+              max:         max,
+              endOnTick:   true,
               labels: {
-                formatter: function() {
-                  var places = max < 10 ? 2 : 0
-                  return formatValue(this.value, places)
-               }
+                    formatter: function() {
+                        var precision = min - max < 1000 ? 2 : 0,
+                            value     = formatValue(this.value, {
+                                            'precision': precision,
+                                            'min':       min,
+                                            'max':       max
+                                        });
+                        return value
+                    }
               }
             },
             plotOptions: {
               series: {
+                shadow: false,
                 marker: {
                   enabled: false,
                   stacking: 'normal',
@@ -376,9 +410,19 @@ var visageGraph = new Class({
             tooltip: {
               formatter: function() {
                 var tip;
-                tip = '<b>' + formatSeriesLabel(this.series.name).trim() + '</b>-> '
-                tip += formatValue(this.y, 2) + ' <br/>'
+                tip =  '<strong>'
+                tip += formatSeriesLabel(this.series.name).trim()
+                tip += '</strong>' + ' -> '
+                tip += '<span style="font-family: monospace; font-size: 14px;">'
+                tip += formatValue(this.y, { 'precision': 2, 'min': min, 'max': max })
+                tip += '<span style="font-size: 9px; color: #777">'
+                tip += ' (' + this.y + ')'
+                tip += '</span>'
+                tip += '</span>'
+                tip += '<br/>'
+                tip += '<span style="font-family: monospace">'
                 tip += formatDate(this.x)
+                tip += '</span>'
 
                 return tip
               }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 +10:00
+date: 2011-05-11 00:00:00 +10:00
 default_executable: visage-app
 dependencies: 
 - !ruby/object:Gem::Dependency