8000 Persistent point selection with transforms compatibility by etpinard · Pull Request #2163 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Persistent point selection with transforms compatibility #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 16, 2017
Merged

Persistent point selection with transforms compatibility #2163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
54cc67b
make hover AND select use same event data pipeline
etpinard Nov 15, 2017
638d03d
adapt Histogram.eventData so that it works with selection pts
etpinard Nov 15, 2017
b30fab4
add Scattercarpet.eventData method
etpinard Nov 15, 2017
949b311
add ScatterTernary.eventData method
etpinard Nov 15, 2017
315e632
add Lib.tagSelected made to make selectedpoints work w/ transforms
etpinard Nov 15, 2017
9b79b3f
add support for selection of aggregations
etpinard Nov 15, 2017
9210278
update point-selection baseline
etpinard Nov 15, 2017
261387d
update event-data jasmine tests (mostly adding pointIndex)
etpinard Nov 15, 2017
451778b
speed up is-pt-index-valid check
etpinard Nov 16, 2017
c8d715b
emit 'normalized' a/b/c coords in scatterternary event data
etpinard Nov 16, 2017
7543dc6
move ptNumber2cdIndex computation to main binning loop
etpinard Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update event-data jasmine tests (mostly adding pointIndex)
  • Loading branch information
@etpinard
etpinard committed Nov 15, 2017
commit 261387dcb04502b82634e2ea220d3d828d3d3f8e
10 changes: 5 additions & 5 deletions test/jasmine/tests/click_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ describe('Test click interactions:', function() {

var pt = futureData.points[0];
expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'x', 'y', 'xaxis', 'yaxis'
]);
expect(pt.curveNumber).toEqual(0);
Expand Down Expand Up @@ -128,7 +128,7 @@ describe('Test click interactions:', function() {

var pt = futureData.points[0];
expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'x', 'y', 'xaxis', 'yaxis'
]);
expect(pt.curveNumber).toEqual(0);
Expand Down Expand Up @@ -208,7 +208,7 @@ describe('Test click interactions:', function() {

var pt = futureData.points[0];
expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'x', 'y', 'xaxis', 'yaxis'
]);
expect(pt.curveNumber).toEqual(0);
Expand Down Expand Up @@ -239,7 +239,7 @@ describe('Test click interactions:', function() {

var pt = futureData.points[0];
expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'x', 'y', 'xaxis', 'yaxis'
]);
expect(pt.curveNumber).toEqual(0);
Expand Down Expand Up @@ -274,7 +274,7 @@ describe('Test click interactions:', function() {

var pt = futureData.points[0];
expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'x', 'y', 'xaxis', 'yaxis'
]);
expect(pt.curveNumber).toEqual(0);
Expand Down
24 changes: 14 additions & 10 deletions test/jasmine/tests/geo_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat', 'location', 'marker.size'
]);
expect(cnt).toEqual(1);
Expand Down Expand Up @@ -632,7 +632,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat', 'location', 'marker.size'
]);
});
Expand Down Expand Up @@ -664,7 +664,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat', 'location', 'marker.size'
]);
});
Expand Down Expand Up @@ -693,7 +693,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'location', 'z'
]);
});
Expand Down Expand Up @@ -721,7 +721,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'location', ' 8000 z'
]);
});
Expand Down Expand Up @@ -753,7 +753,7 @@ describe('Test geo interactions', function() {

it('should contain the correct fields', function() {
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'location', 'z'
]);
});
Expand Down Expand Up @@ -1303,7 +1303,8 @@ describe('Test event property of interactions on a geo plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat',
'location', 'text', 'marker.size'
]);

Expand Down Expand Up @@ -1351,7 +1352,8 @@ describe('Test event property of interactions on a geo plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat',
'location', 'text', 'marker.size'
]);

Expand Down 8000 Expand Up @@ -1392,7 +1394,8 @@ describe('Test event property of interactions on a geo plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat',
'location', 'text', 'marker.size'
]);

Expand Down Expand Up @@ -1428,7 +1431,8 @@ describe('Test event property of interactions on a geo plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
'lon', 'lat',
'location', 'text', 'marker.size'
]);

Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/mapbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ describe('@noCI, mapbox plots', function() {
return _mouseEvent('mousemove', pointPos, function() {
expect(hoverData).not.toBe(undefined, 'firing on data points');
expect(Object.keys(hoverData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
], 'returning the correct event data keys');
expect(hoverData.curveNumber).toEqual(0, 'returning the correct curve number');
expect(hoverData.pointNumber).toEqual(0, 'returning the correct point number');
Expand All @@ -778,7 +778,7 @@ describe('@noCI, mapbox plots', function() {
return _mouseEvent('mousemove', blankPos, function() {
expect(unhoverData).not.toBe(undefined, 'firing on data points');
expect(Object.keys(unhoverData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
], 'returning the correct event data keys');
expect(unhoverData.curveNumber).toEqual(0, 'returning the correct curve number');
expect(unhoverData.pointNumber).toEqual(0, 'returning the correct point number');
Expand Down Expand Up @@ -859,7 +859,7 @@ describe('@noCI, mapbox plots', function() {
return _click(pointPos, function() {
expect(ptData).not.toBe(undefined, 'firing on data points');
expect(Object.keys(ptData)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
], 'returning the correct event data keys');
expect(ptData.curveNumber).toEqual(0, 'returning the correct curve number');
expect(ptData.pointNumber).toEqual(0, 'returning the correct point number');
Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/tests/scattermapbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
]);

expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
Expand Down Expand Up @@ -741,7 +741,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
]);

expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
Expand Down Expand Up @@ -778,7 +778,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
]);

expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
Expand Down Expand Up @@ -810,7 +810,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
evt = futureData.event;

expect(Object.keys(pt)).toEqual([
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
]);

expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
Expand Down
13 changes: 13 additions & 0 deletions test/jasmine/tests/select_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,15 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectedData.points, [{
curveNumber: 0,
pointNumber: 0,
pointIndex: 0,
x: 0.002,
y: 16.25,
id: 'id-0.002',
customdata: 'customdata-16.25'
}, {
curveNumber: 0,
pointNumber: 1,
pointIndex: 1,
x: 0.004,
y: 12.5,
id: 'id-0.004',
Expand Down Expand Up @@ -199,13 +201,15 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectingData.points, [{
curveNumber: 0,
pointNumber: 0,
pointIndex: 0,
x: 0.002,
y: 16.25,
id: 'id-0.002',
customdata: 'customdata-16.25'
}, {
curveNumber: 0,
pointNumber: 1,
pointIndex: 1,
x: 0.004,
y: 12.5,
id: 'id-0.004',
Expand All @@ -225,20 +229,23 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectingData.points, [{
curveNumber: 0,
pointNumber: 0,
pointIndex: 0,
x: 0.002,
y: 16.25,
id: 'id-0.002',
customdata: 'customdata-16.25'
}, {
curveNumber: 0,
pointNumber: 1,
pointIndex: 1,
x: 0.004,
y: 12.5,
id: 'id-0.004',
customdata: 'customdata-12.5'
}, {
curveNumber: 0,
pointNumber: 4,
pointIndex: 4,
x: 0.013,
y: 6.875,
id: 'id-0.013',
Expand All @@ -252,13 +259,15 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectingData.points, [{
curveNumber: 0,
pointNumber: 0,
pointIndex: 0,
x: 0.002,
y: 16.25,
id: 'id-0.002',
customdata: 'customdata-16.25'
}, {
curveNumber: 0,
pointNumber: 1,
pointIndex: 1,
x: 0.004,
y: 12.5,
id: 'id-0.004',
Expand Down Expand Up @@ -299,6 +308,7 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectingData.points, [{
curveNumber: 0,
pointNumber: 10,
pointIndex: 10,
x: 0.099,
y: 2.75
}], 'with the correct selecting points (1)');
Expand All @@ -307,6 +317,7 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectedData.points, [{
curveNumber: 0,
pointNumber: 10,
pointIndex: 10,
x: 0.099,
y: 2.75,
}], 'with the correct selected points (2)');
Expand Down Expand Up @@ -374,6 +385,7 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectingData.points, [{
curveNumber: 0,
pointNumber: 10,
pointIndex: 10,
x: 0.099,
y: 2.75
}], 'with the correct selecting points (1)');
Expand All @@ -382,6 +394,7 @@ describe('Test select box and lasso in general:', function() {
assertEventData(selectedData.points, [{
curveNumber: 0,
pointNumber: 10,
pointIndex: 10,
x: 0.099,
y: 2.75,
}], 'with the correct selected points (2)');
Expand Down
Loading
0