IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

options per series is starting to work nicely

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-19 16:57:33 +02:00
parent 048763053c
commit cdcbb872d5
5 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/directives/grafanaGraph.js
View File

@ -184,18 +184,26 @@ function (angular, $, kbn, moment, _) {
}
function applySeriesOverrideOptions(series) {
series.lines = {};
series.points = {};
series.bars = {};
for (var i = 0; i < scope.panel.seriesOverrides.length; i++) {
var override = scope.panel.seriesOverrides[i];
if (override.alias === series.info.alias) {
if (!_.isUndefined(override.fill)) {
series.lines = {
fill: override.fill === 0 ? 0.001 : override.fill/10
};
}
if (override.alias !== series.info.alias) {
continue;
}
if (override.lines !== void 0) { series.lines.show = override.lines; }
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); }
}
}
function translateFillOption(fill) {
return fill === 0 ? 0.001 : fill/10;
}
function shouldDelayDraw(panel) {
if (panel.legend.rightSide) {
return true;

1
src/app/panels/graph/module.js
View File

@ -352,6 +352,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries) {
$scope.removeSeriesOverride = function(override) {
$scope.panel.seriesOverrides = _.without($scope.panel.seriesOverrides, override);
$scope.render();
};
panelSrv.init($scope);

4
src/app/panels/graph/seriesOverridesCtrl.js
View File

@ -41,6 +41,7 @@ define([
$scope.removeOverride = function(option) {
delete $scope.override[option.propertyName];
$scope.updateCurrentOverrides();
$scope.render();
};
$scope.updateCurrentOverrides = function() {
@ -59,7 +60,8 @@ define([
$scope.addOverrideOption('Bars', 'bars', [true, false]);
$scope.addOverrideOption('Lines', 'lines', [true, false]);
$scope.addOverrideOption('Points', 'points', [true, false]);
$scope.addOverrideOption('Line fill', 'fill', [1,2,3,4,5,6,7,8]);
$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.updateCurrentOverrides();
});

5
src/app/panels/graph/styleEditor.html
View File

@ -84,7 +84,10 @@
alias or regex
</li>
<li>
<input type="text" ng-model="override.alias" class="input-medium grafana-target-segment-input" >
<input type="text"
ng-model="override.alias"
ng-model-onblur ng-change="render()"
class="input-medium grafana-target-segment-input" >
</li>
<li class="grafana-target-segment" ng-repeat="option in currentOverrides">
<a class="pointer" ng-click="removeOverride(option)">

24
src/test/specs/grafanaGraph-specs.js
View File

@ -74,23 +74,41 @@ define([
});
graphScenario('series option fill override', function(ctx) {
graphScenario('series option overrides, fill & points', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.lines = true;
scope.panel.fill = 5;
scope.panel.seriesOverrides = [
{ alias: 'test', fill: 0 }
{ alias: 'test', fill: 0, points: true }
];
data[1].info.alias = 'test';
});
it('should match second series and set line fill', function() {
it('should match second series and fill zero, and enable points', function() {
expect(ctx.plotOptions.series.lines.fill).to.be(0.5);
expect(ctx.plotData[1].lines.fill).to.be(0.001);
expect(ctx.plotData[1].points.show).to.be(true);
});
});
graphScenario('series option overrides, bars, true & lines false', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.lines = true;
scope.panel.seriesOverrides = [
{ alias: 'test', bars: true, lines: false }
];
data[1].info.alias = 'test';
});
it('should match second series and disable lines, and enable bars', function() {
expect(ctx.plotOptions.series.lines.show).to.be(true);
expect(ctx.plotData[1].lines.show).to.be(false);
expect(ctx.plotData[1].bars.show).to.be(true);
});
});
});
});