From a70243d9e9a7bf301b0453d5e9a411593327ca36 Mon Sep 17 00:00:00 2001 From: yamakatu Date: Fri, 29 Nov 2013 22:58:54 +0900 Subject: [PATCH 1/3] add no zero filling option to histogram --- src/app/panels/histogram/timeSeries.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/app/panels/histogram/timeSeries.js b/src/app/panels/histogram/timeSeries.js index 8885e734371..f2558dc9108 100644 --- a/src/app/panels/histogram/timeSeries.js +++ b/src/app/panels/histogram/timeSeries.js @@ -101,6 +101,8 @@ function (_, Interval) { strategy = this._getAllFlotPairs; } else if(this.opts.fill_style === 'null') { strategy = this._getNullFlotPairs; + } else if(this.opts.fill_style === 'no') { + strategy = this._getiNoZeroFlotPairs; } else { strategy = this._getMinFlotPairs; } @@ -211,6 +213,19 @@ function (_, Interval) { 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._getiNoZeroFlotPairs = function (result, time, i, times) { + var next, expected_next, prev, expected_prev; + // add the current time + result.push([ time, this._data[time] || 0 ]); + + return result; + }; + return ts; }); \ No newline at end of file From 678b96d4f06c1ca0a3d7ccb9d51cdd962baa77f1 Mon Sep 17 00:00:00 2001 From: yamakatu Date: Fri, 29 Nov 2013 23:37:07 +0900 Subject: [PATCH 2/3] change function name --- src/app/panels/histogram/timeSeries.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/panels/histogram/timeSeries.js b/src/app/panels/histogram/timeSeries.js index f2558dc9108..9b7138adbe2 100644 --- a/src/app/panels/histogram/timeSeries.js +++ b/src/app/panels/histogram/timeSeries.js @@ -102,7 +102,7 @@ function (_, Interval) { } else if(this.opts.fill_style === 'null') { strategy = this._getNullFlotPairs; } else if(this.opts.fill_style === 'no') { - strategy = this._getiNoZeroFlotPairs; + strategy = this._getNoZeroFlotPairs; } else { strategy = this._getMinFlotPairs; } @@ -218,7 +218,7 @@ function (_, Interval) { * 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._getiNoZeroFlotPairs = function (result, time, i, times) { + ts.ZeroFilled.prototype._getNoZeroFlotPairs = function (result, time, i, times) { var next, expected_next, prev, expected_prev; // add the current time From 43b844fb79aa46fd0f1a7eee3dc4b5666f3b8684 Mon Sep 17 00:00:00 2001 From: yamakatu Date: Fri, 6 Dec 2013 15:31:21 +0900 Subject: [PATCH 3/3] modify the function so that does not show 0, when two or more lines are drawn. --- src/app/panels/histogram/timeSeries.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/panels/histogram/timeSeries.js b/src/app/panels/histogram/timeSeries.js index 9b7138adbe2..02f5f54e20f 100644 --- a/src/app/panels/histogram/timeSeries.js +++ b/src/app/panels/histogram/timeSeries.js @@ -222,7 +222,9 @@ function (_, Interval) { var next, expected_next, prev, expected_prev; // add the current time - result.push([ time, this._data[time] || 0 ]); + if(this._data[time]){ + result.push([ time, this._data[time]]); + } return result; };