Commit 0aae78c6 by Torkel Ödegaard

Graph: fix for bars not displaying, caused by change in recent commit, added…

Graph: fix for bars not displaying, caused by change in recent commit, added unit test so it does not happen again
parent e86207bb
...@@ -97,7 +97,7 @@ function (_, kbn) { ...@@ -97,7 +97,7 @@ function (_, kbn) {
result.push([currentTime * 1000, currentValue]); result.push([currentTime * 1000, currentValue]);
} }
if (result.length > 2) { if (result.length >= 2) {
this.stats.timeStep = result[1][0] - result[0][0]; this.stats.timeStep = result[1][0] - result[0][0];
} }
......
...@@ -184,8 +184,8 @@ function (angular, $, kbn, moment, _, GraphTooltip) { ...@@ -184,8 +184,8 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
} }
} }
if (data.length && data[0].info.timeStep) { if (data.length && data[0].stats.timeStep) {
options.series.bars.barWidth = data[0].info.timeStep / 1.5; options.series.bars.barWidth = data[0].stats.timeStep / 1.5;
} }
addTimeAxis(options); addTimeAxis(options);
......
...@@ -126,6 +126,20 @@ define([ ...@@ -126,6 +126,20 @@ define([
}); });
}); });
graphScenario('should use timeStep for barWidth', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.bars = true;
data[0] = new TimeSeries({
datapoints: [[1,10],[2,20]],
info: { alias: 'series1', enable: true }
});
});
it('should set barWidth', function() {
expect(ctx.plotOptions.series.bars.barWidth).to.be(10000/1.5);
});
});
graphScenario('series option overrides, fill & points', function(ctx) { graphScenario('series option overrides, fill & points', function(ctx) {
ctx.setup(function(scope, data) { ctx.setup(function(scope, data) {
scope.panel.lines = true; scope.panel.lines = true;
......
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