github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixed test on XAxis and added dataTypes to XAxis

Browse source
This commit is contained in:
Juan Thomassie 2014-08-28 18:27:01 -05:00
parent e35a6af0c4
commit 343e97cae4
4 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kibana/components/vislib/components/styles/main.less
View file

@ -358,7 +358,7 @@ path, line, .axis line, .axis path {
flex: 8 1;
flex-direction: row;
// overflow: visible;
min-height: 16px;
min-height: 20px;
}

2
src/kibana/components/vislib/modules/Handler.js
View file

@ -17,9 +17,9 @@ define(function (require) {
return new Handler(vis);
}
this.data = new Data(vis.data);
this.vis = vis;
this.el = vis.el;
this.data = new Data(vis.data);
this.ChartClass = vis.ChartClass;
this._attr = _.defaults(vis._attr || {}, {
'margin' : { top: 10, right: 3, bottom: 5, left: 3 }

39
src/kibana/components/vislib/modules/Xaxis.js
View file

@ -232,15 +232,18 @@ define(function (require) {
var ratio;
var flex;
var chartToXaxis;
var dataType = selection[0][0].__data__.rows ? 'rows' : 'columns';
var dataType;
dataType = selection[0].parentNode.__data__.series ? 'series' :
selection[0].parentNode.__data__.rows ? 'rows' : 'columns';
var rotScale = d3.scale.linear()
.domain([0.14, 0.28, 0.85, 2.6])
.range([5, 10, 30, 100]);
var flatScale = d3.scale.linear()
.domain([2.2, 14.5])
.range([1.2, 11]);
.domain([1.3, 8, 14.5, 29])
.range([1.1, 9, 13, 30]);
selection.each(function () {
@ -248,32 +251,34 @@ define(function (require) {
svg = div.select('svg');
tick = svg.select('.tick');
if (dataType === 'rows') {
chartwrap = visEl.find('.chart-wrapper-row');
titlespace = 10;
} else {
chartwrap = visEl.find('.chart-wrapper-column');
titlespace = 28;
}
xwrapper = visEl.find('.x-axis-wrapper');
xdiv = visEl.find('.x-axis-div');
xdivwrapper = visEl.find('.x-axis-div-wrapper');
yspacerblock = visEl.find('.y-axis-spacer-block');
//console.log(self._attr.isRotated);
if (dataType === 'series') {
chartwrap = visEl.find('.chart-wrapper');
titlespace = 15;
} else if (dataType === 'rows') {
chartwrap = visEl.find('.chart-wrapper-row');
titlespace = 15;
} else {
chartwrap = visEl.find('.chart-wrapper-column');
titlespace = 30;
}
if (!self._attr.isRotated) {
// flat labels
ratio = flatScale(1800 / chartwrap.height());
xdivwrapper.css('flex', flex + ' 1');
ratio = flatScale(35 * (titlespace +
tick.node().getBBox().height) / chartwrap.height());
//console.log('FLAT:', ratio);
//console.log(chartwrap.height());
//console.log(chartwrap.height(), tick.node().getBBox());
} else {
// rotated labels
ratio = rotScale((titlespace + tick.node().getBBox().height) / chartwrap.height());
div.style('height', 2 + tick.node().getBBox().height + 'px');
svg.attr('height', 2 + tick.node().getBBox().height + 'px');
//xdivwrapper.css('min-height', tick.node().getBBox().height);
//console.log('ROT:', ratio);
//console.log((titlespace + tick.node().getBBox().height) / chartwrap.height());
}
flex = ratio.toFixed(1);
@ -283,7 +288,7 @@ define(function (require) {
//console.log('flex:', flex);
});
};
return XAxis;

6
test/unit/specs/vislib/xAxis.js
View file

@ -79,16 +79,18 @@ define(function (require) {
beforeEach(function () {
inject(function (d3, Private) {
XAxis = Private(require('components/vislib/modules/Xaxis'));
Data = Private(require('components/vislib/modules/Data'));
XAxis = Private(require('components/vislib/modules/Xaxis'));
el = d3.select('body').append('div')
.attr('class', 'x-axis-wrapper')
.datum(data)
.append('div')
.attr('class', 'x-axis-div')
.style('height', '20px');
dataObj = new Data(data);
xAxis = new XAxis({
el: $('.x-axis-wrapper')[0],
xValues: dataObj.xValues(),