Commit eaa200a7 by Torkel Ödegaard

Fix for Max legend value when max value is zero (Issue #460)

parent f422c844
...@@ -11,7 +11,7 @@ vNext ...@@ -11,7 +11,7 @@ vNext
**Fixes** **Fixes**
- Fix formatting negative values (PR #545) - Fix formatting negative values (PR #545)
- Fix for Max legend value when max value is zero (Issue #460)
# 1.6.1 (2014-06-24) # 1.6.1 (2014-06-24)
......
...@@ -20,17 +20,21 @@ function (_, kbn) { ...@@ -20,17 +20,21 @@ function (_, kbn) {
this.yaxis = this.info.yaxis; this.yaxis = this.info.yaxis;
this.info.total = 0; this.info.total = 0;
this.info.max = null; this.info.max = -212312321312;
this.info.min = 212312321312; this.info.min = 212312321312;
_.each(this.datapoints, function(valueArray) { var ignoreNulls = fillStyle === 'connected';
var currentTime = valueArray[1]; var nullAsZero = fillStyle === 'null as zero';
var currentValue = valueArray[0]; var currentTime;
var currentValue;
for (var i = 0; i < this.datapoints.length; i++) {
currentValue = this.datapoints[i][0];
currentTime = this.datapoints[i][1];
if (currentValue === null) { if (currentValue === null) {
if (fillStyle === 'connected') { if (ignoreNulls) { continue; }
return; if (nullAsZero) {
}
if (fillStyle === 'null as zero') {
currentValue = 0; currentValue = 0;
} }
} }
...@@ -48,7 +52,7 @@ function (_, kbn) { ...@@ -48,7 +52,7 @@ function (_, kbn) {
} }
result.push([currentTime * 1000, currentValue]); result.push([currentTime * 1000, currentValue]);
}, this); }
if (result.length > 2) { if (result.length > 2) {
this.info.timeStep = result[1][0] - result[0][0]; this.info.timeStep = result[1][0] - result[0][0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment