Commit 4f83748c authored by David Anderson's avatar David Anderson
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents db25935a 5552865f
......@@ -77,6 +77,7 @@ export class ScatterChartDemoComponent {
bottomAxis.shouldExtendTicksAcrossChart = true;
let selectedData: DataPoint[] = [];
baseChart.margin = 5;
selectionChart.datalist( selectedData );
me.chart.addChart( baseChart );
me.chart.addChart( selectionChart );
......@@ -101,7 +102,7 @@ export class ScatterChartDemoComponent {
}
},
3
5
);
let zoom = new ZoomBehavior();
// zoom.limitZoom( axis, 0.5, 1.5 );
......
......@@ -53,7 +53,8 @@ export class ScatterChartImplementation extends BaseChartImplementation {
public getDataAtCoord( px: number, py: number, closeEnough: number ): DataPoint[] {
let activePoints: Array<Point> = [];
px += this.chart.margin;
py += this.chart.margin;
let xi = px - closeEnough, xo = px + closeEnough, yi = py - closeEnough, yo = py + closeEnough;
this.quadTree.visit(( node: any, x0, y0, x1, y1 ) => {
if ( !node.length ) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment