maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[vislib/data] support getters in getYMin and getYMax

Browse source
This commit is contained in:
Spencer Alger 2015-02-06 10:29:46 -07:00
parent b35a3d9867
commit 5956677d42
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/kibana/components/vislib/lib/data.js
View file

@ -333,9 +333,12 @@ define(function (require) {
* stacking into consideration.
*
* @method gitYMin
* @param {function} [getValue] - optional getter that will receive a
* point and should return the value that should
* be considered
* @returns {Number} Min y axis value
*/
Data.prototype.gitYMin = function () {
Data.prototype.gitYMin = function (getValue) {
var self = this;
var arr = [];
@ -356,7 +359,7 @@ define(function (require) {
// for each object in the dataArray,
// push the calculated y value to the initialized array (arr)
_.each(this.chartData(), function (chart) {
min = Math.min(min, self._getYExtent(chart, 'min'));
min = Math.min(min, self._getYExtent(chart, 'min', getValue));
});
return min;
@ -367,9 +370,12 @@ define(function (require) {
* stacking into consideration.
*
* @method gitYMax
* @param {function} [getValue] - optional getter that will receive a
* point and should return the value that should
* be considered
* @returns {Number} Max y axis value
*/
Data.prototype.gitYMax = function () {
Data.prototype.gitYMax = function (getValue) {
var self = this;
var arr = [];
@ -389,7 +395,7 @@ define(function (require) {
// for each object in the dataArray,
// push the calculated y value to the initialized array (arr)
_.each(this.chartData(), function (chart) {
max = Math.max(max, self._getYExtent(chart, 'max'));
max = Math.max(max, self._getYExtent(chart, 'max', getValue));
});
return max;
@ -411,20 +417,24 @@ define(function (require) {
/**
* Returns the max Y axis value for a `series` array based on
* a specified callback function (calculation).
* @param {function} [getValue] - Optional getter that will be used to read
* values from points when calculating the extent.
* default is either this._getYStack or this.getY
* based on this.shouldBeStacked().
*/
Data.prototype._getYExtent = function (chart, extent) {
var calculation = this._getY;
Data.prototype._getYExtent = function (chart, extent, getValue) {
if (this.shouldBeStacked()) {
this.stackData(_.pluck(chart.series, 'values'));
calculation = this._getYStack;
getValue = getValue || this._getYStack;
} else {
getValue = getValue || this._getY;
}
var points = chart.series
.reduce(function (points, series) {
return points.concat(series.values);
}, [])
.map(calculation);
.map(getValue);
return d3[extent](points);
};

12
test/unit/specs/vislib/lib/data.js
View file

@ -293,6 +293,12 @@ define(function (require) {
expect(_.min(series.values, function (d) { return d.x; })).to.be.greaterThan(minValue);
expect(_.min(stackedSeries.values, function (d) { return d.x; })).to.be.greaterThan(stackedMinValue);
});
it('allows passing a value getter for manipulating the values considered', function () {
var realMin = visData.gitYMin();
var multiplier = 13.2;
expect(visData.gitYMin(function (d) { return d.y * multiplier; })).to.be(realMin * multiplier);
});
});
describe('gitYMax method', function () {
@ -336,6 +342,12 @@ define(function (require) {
expect(_.min(series, function (d) { return d.x; })).to.be.greaterThan(maxValue);
expect(_.min(stackedSeries, function (d) { return d.x; })).to.be.greaterThan(stackedMaxValue);
});
it('allows passing a value getter for manipulating the values considered', function () {
var realMax = visData.gitYMax();
var multiplier = 13.2;
expect(visData.gitYMax(function (d) { return d.y * multiplier; })).to.be(realMax * multiplier);
});
});
});