mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #742 from yamakatu/master
Fix for #741. add no zero filling option to histogram
This commit is contained in:
commit
e58e917677
@ -101,6 +101,8 @@ function (_, Interval) {
|
|||||||
strategy = this._getAllFlotPairs;
|
strategy = this._getAllFlotPairs;
|
||||||
} else if(this.opts.fill_style === 'null') {
|
} else if(this.opts.fill_style === 'null') {
|
||||||
strategy = this._getNullFlotPairs;
|
strategy = this._getNullFlotPairs;
|
||||||
|
} else if(this.opts.fill_style === 'no') {
|
||||||
|
strategy = this._getNoZeroFlotPairs;
|
||||||
} else {
|
} else {
|
||||||
strategy = this._getMinFlotPairs;
|
strategy = this._getMinFlotPairs;
|
||||||
}
|
}
|
||||||
@ -211,6 +213,21 @@ function (_, Interval) {
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ** called as a reduce stragegy in getFlotPairs() **
|
||||||
|
* Not fill zero's on either side of the current time, only the current time
|
||||||
|
* @return {array} An array of points to plot with flot
|
||||||
|
*/
|
||||||
|
ts.ZeroFilled.prototype._getNoZeroFlotPairs = function (result, time, i, times) {
|
||||||
|
var next, expected_next, prev, expected_prev;
|
||||||
|
|
||||||
|
// add the current time
|
||||||
|
if(this._data[time]){
|
||||||
|
result.push([ time, this._data[time]]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
};
|
||||||
|
|
||||||
return ts;
|
return ts;
|
||||||
});
|
});
|
Loading…
Reference in New Issue
Block a user