IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-08 12:18:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

More options can now be set on pre series basis, this is awesome!

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-08-19 17:24:37 +02:00
parent cdcbb872d5
commit 062fe72030
3 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/directives/grafanaGraph.js
+5
View File
@@ -187,6 +187,7 @@ function (angular, $, kbn, moment, _) {
series.lines = {};
series.points = {};
series.bars = {};
delete series.stack;
for (var i = 0; i < scope.panel.seriesOverrides.length; i++) {
var override = scope.panel.seriesOverrides[i];
@@ -197,6 +198,10 @@ function (angular, $, kbn, moment, _) {
if (override.points !== void 0) { series.points.show = override.points; }
if (override.bars !== void 0) { series.bars.show = override.bars; }
if (override.fill !== void 0) { series.lines.fill = translateFillOption(override.fill); }
if (override.stack !== void 0) { series.stack = override.stack; }
if (override.linewidth !== void 0) { series.lines.lineWidth = override.linewidth; }
if (override.pointradius !== void 0) { series.points.radius = override.pointradius; }
if (override.steppedLine !== void 0) { series.lines.steps = override.steppedLine; }
}
}
src/app/panels/graph/seriesOverridesCtrl.js
+4 -1
View File
@@ -59,9 +59,12 @@ define([
$scope.addOverrideOption('Bars', 'bars', [true, false]);
$scope.addOverrideOption('Lines', 'lines', [true, false]);
$scope.addOverrideOption('Points', 'points', [true, false]);
$scope.addOverrideOption('Line fill', 'fill', [0,1,2,3,4,5,6,7,8,9,10]);
$scope.addOverrideOption('Line width', 'linewidth', [0,1,2,3,4,5,6,7,8,9,10]);
$scope.addOverrideOption('Staircase line', 'steppedLine', [true, false]);
$scope.addOverrideOption('Points', 'points', [true, false]);
$scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]);
$scope.addOverrideOption('Stack', 'stack', [true, false]);
$scope.updateCurrentOverrides();
});
src/test/specs/grafanaGraph-specs.js
+36
View File
@@ -109,6 +109,42 @@ define([
});
});
graphScenario('series option overrides, linewidth, stack', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.lines = true;
scope.panel.stack = true;
scope.panel.linewidth = 2;
scope.panel.seriesOverrides = [
{ alias: 'test', linewidth: 5, stack: false }
];
data[1].info.alias = 'test';
});
it('should match second series and disable stack, and set lineWidth', function() {
expect(ctx.plotOptions.series.stack).to.be(true);
expect(ctx.plotData[1].stack).to.be(false);
expect(ctx.plotData[1].lines.lineWidth).to.be(5);
});
});
graphScenario('series option overrides, pointradius, steppedLine', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.seriesOverrides = [
{ alias: 'test', pointradius: 5, steppedLine: true }
];
data[1].info.alias = 'test';
});
it('should match second series and set pointradius, and set steppedLine', function() {
expect(ctx.plotData[1].points.radius).to.be(5);
expect(ctx.plotData[1].lines.steps).to.be(true);
});
});
});
});