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

Merge pull request #402 from stormpython/feature/brush

Browse source 
Fixes Brush Github Issue #363
This commit is contained in:
Spencer 2014-09-26 13:45:21 -07:00
commit 1ae02930c4
2 changed files with 41 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kibana/components/vislib/lib/dispatch.js
View file

@ -69,12 +69,14 @@ define(function (require) {
// if `addBrushing` is true, add brush canvas
if (isBrush) {
return svg.append('g')
svg.append('g')
.attr('class', 'brush')
.call(brush)
.selectAll('rect')
.attr('height', height - margin.top - margin.bottom);
}
return brush;
};
return Dispatch;

58
src/kibana/components/vislib/visualizations/column_chart.js
View file

@ -114,28 +114,45 @@ define(function (require) {
return bars;
};
ColumnChart.prototype.addBarEvents = function (bars) {
ColumnChart.prototype.addBarEvents = function (svg, bars, brush) {
var events = this.events;
var dispatch = this.events._attr.dispatch;
var xScale = this.vis.xAxis.xScale;
var startXInv;
bars
.on('mouseover.bar', function (d, i) {
d3.select(this)
.classed('hover', true)
.style('stroke', '#333')
.style('cursor', 'pointer');
.on('mouseover.bar', function (d, i) {
d3.select(this)
.classed('hover', true)
.style('stroke', '#333')
.style('cursor', 'pointer');
dispatch.hover(events.eventResponse(d, i));
d3.event.stopPropagation();
})
.on('click.bar', function (d, i) {
dispatch.click(events.eventResponse(d, i));
d3.event.stopPropagation();
})
.on('mouseout.bar', function () {
d3.select(this).classed('hover', false)
.style('stroke', null);
});
dispatch.hover(events.eventResponse(d, i));
d3.event.stopPropagation();
})
.on('mousedown.bar', function () {
var bar = d3.select(this);
var startX = d3.mouse(svg.node());
startXInv = xScale.invert(startX[0]);
// Reset the brush value
brush.extent([startXInv, startXInv]);
// Magic!
// Need to call brush on svg to see brush when brushing
// while on top of bars.
// Need to call brush on bar to allow the click event to be registered
svg.call(brush);
bar.call(brush);
})
.on('click.bar', function (d, i) {
dispatch.click(events.eventResponse(d, i));
d3.event.stopPropagation();
})
.on('mouseout.bar', function () {
d3.select(this).classed('hover', false)
.style('stroke', null);
});
};
ColumnChart.prototype.draw = function () {
@ -154,6 +171,7 @@ define(function (require) {
var width;
var height;
var layers;
var brush;
var bars;
return function (selection) {
@ -179,15 +197,15 @@ define(function (require) {
.append('g')
.attr('transform', 'translate(0,' + margin.top + ')');
// addBrush canvas
self.events.addBrush(xScale, svg);
// addBrush canvas and return brush function
brush = self.events.addBrush(xScale, svg);
// add bars
bars = self.addBars(svg, layers);
// add events to bars
if (isEvents) {
self.addBarEvents(bars);
self.addBarEvents(svg, bars, brush);
}
// chart base line