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

Graph: Add fill gradient option to series override line fill (#20941)

Browse Source
This commit is contained in:
Hendrik van Huyssteen 2019-12-10 10:09:48 +02:00 committed by Torkel Ödegaard
parent 5e34e061d5
commit bf0d87aaf6
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/core/specs/time_series.test.ts
View File

@ -276,6 +276,19 @@ describe('TimeSeries', () => {
});
});
describe('fillGradient', () => {
beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', fill: 10, fillGradient: 10 }]);
});
it('should set fillcolor to gradient', () => {
expect(series.lines.fillColor).toMatchObject({
colors: [{ opacity: 0.0 }, { opacity: 1 }],
});
});
});
describe('series option overrides, bars, true & lines false', () => {
beforeEach(() => {
series.alias = 'test';

13
public/app/core/time_series2.ts
View File

@ -19,6 +19,16 @@ function translateFillOption(fill: number) {
return fill === 0 ? 0.001 : fill / 10;
}
function getFillGradient(amount: number) {
if (!amount) {
return null;
}
return {
colors: [{ opacity: 0.0 }, { opacity: amount / 10 }],
};
}
/**
* Calculate decimals for legend and update values for each series.
* @param data series data
@ -157,6 +167,9 @@ export default class TimeSeries {
if (override.fill !== void 0) {
this.lines.fill = translateFillOption(override.fill);
}
if (override.fillGradient !== void 0) {
this.lines.fillColor = getFillGradient(override.fillGradient);
}
if (override.stack !== void 0) {
this.stack = override.stack;
}

2
public/app/plugins/panel/graph/module.ts
View File

@ -79,7 +79,7 @@ class GraphCtrl extends MetricsPanelCtrl {
lines: true,
// fill factor
fill: 1,
// fill factor
// fill gradient
fillGradient: 0,
// line width in pixels
linewidth: 1,

1
public/app/plugins/panel/graph/series_overrides_ctrl.ts
View File

@ -101,6 +101,7 @@ export function SeriesOverridesCtrl($scope: any, $element: JQuery, popoverSrv: a
$scope.addOverrideOption('Bars', 'bars', [true, false]);
$scope.addOverrideOption('Lines', 'lines', [true, false]);
$scope.addOverrideOption('Line fill', 'fill', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
$scope.addOverrideOption('Fill gradient', 'fillGradient', [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('Null point mode', 'nullPointMode', ['connected', 'null', 'null as zero']);
$scope.addOverrideOption('Fill below to', 'fillBelowTo', $scope.getSeriesNames());