IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-10 08:03:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only take bar series to calculate barWidth (#6756)

Browse Source 
* Only take bar series to calculate barWidth

solves #6751

* Typo

* Typo

* Typo

* Typo

* Refactor

* Simplify
This commit is contained in:
Ben RUBSON 2016-12-06 08:36:23 +01:00 committed by Torkel Ödegaard
parent 5f6a3ecd56
commit e51525dbde
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/panel/graph/graph.ts
View File

@ -185,6 +185,7 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
// Series could have different timeSteps,
// let's find the smallest one so that bars are correctly rendered.
// In addition, only take series which are rendered as bars for this.
function getMinTimeStepOfSeries(data) {
var min = Number.MAX_VALUE;
@ -192,6 +193,15 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
if (!data[i].stats.timeStep) {
continue;
}
if (panel.bars) {
if (data[i].bars && data[i].bars.show === false) {
continue;
}
} else {
if (typeof data[i].bars === 'undefined' || typeof data[i].bars.show === 'undefined' || !data[i].bars.show) {
continue;
}
}
if (data[i].stats.timeStep < min) {
min = data[i].stats.timeStep;