Skip to content

Throttle selectPoints #2040

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
alexcjohnson merged 10 commits into from
Sep 28, 2017
Merged

Throttle selectPoints #2040

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a6df912
generalized event throttling routine
alexcjohnson Sep 26, 2017
aa434dd
move getGraphDiv to lib so we can use it outside plot_api
alexcjohnson Sep 26, 2017
753b2c9
unwrap [].push.apply
alexcjohnson Sep 27, 2017
256c5c7
throttle just the selectPoints part of box/lasso selection
alexcjohnson Sep 27, 2017
80508e8
throttle.done method and test updates
alexcjohnson Sep 28, 2017
0861736
fix docs for getGraphDiv
alexcjohnson Sep 28, 2017
1968af7
Merge branch 'master' into throttle-select
alexcjohnson Sep 28, 2017
6da3cfa
remove silently broken and obsolete select box node creation tests
alexcjohnson Sep 28, 2017
b6d64be
alter argument order of throttle.throttle
alexcjohnson Sep 28, 2017
811073e
clean up geo_test for new throttle
alexcjohnson Sep 28, 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
87 changes: 5 additions & 82 deletions test/jasmine/tests/select_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ function resetEvents(gd) {

selectedPromise = new Promise(function(resolve) {
gd.on('plotly_selecting', function(data) {
// note that since all of these events test node counts,
// and all of the other tests at some point check that each of
// these event handlers was called (via assertEventCounts),
// we no longer need separate tests that these nodes are created
// and this way *all* subplot variants get the test.
assertSelectionNodes(1, 2);
selectingCnt++;
selectingData = data;
Expand Down Expand Up @@ -130,88 +135,6 @@ describe('Test select box and lasso in general:', function() {
});
}

describe('select elements', function() {
var mockCopy = Lib.extendDeep({}, mock);
mockCopy.layout.dragmode = 'select';

var gd;
beforeEach(function(done) {
gd = createGraphDiv();

Plotly.plot(gd, mockCopy.data, mockCopy.layout)
.then(done);
});

it('should be appended to the zoom layer', function(done) {
var x0 = 100,
y0 = 200,
x1 = 150,
y1 = 250,
x2 = 50,
y2 = 50;
Copy link
Collaborator Author

@alexcjohnson alexcjohnson Sep 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(x2, y2) is in the top margin of this plot, so the doubleclick didn't do anything. But since these tests didn't actually check that the handlers ever got called, it didn't cause a failure.

Copy link
Contributor

@etpinard etpinard Sep 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice investigation work. Thanks!


gd.once('plotly_selecting', function() {
assertSelectionNodes(1, 2);
});

gd.once('plotly_selected', function() {
assertSelectionNodes(0, 2);
});

gd.once('plotly_deselect', function() {
assertSelectionNodes(0, 0);
});

Lib.clearThrottle();
mouseEvent('mousemove', x0, y0);
assertSelectionNodes(0, 0);

drag([[x0, y0], [x1, y1]]);
doubleClick(x2, y2).then(done);
});
});

describe('lasso elements', function() {
var mockCopy = Lib.extendDeep({}, mock);
mockCopy.layout.dragmode = 'lasso';

var gd;
beforeEach(function(done) {
gd = createGraphDiv();

Plotly.plot(gd, mockCopy.data, mockCopy.layout)
.then(done);
});

it('should be appended to the zoom layer', function(done) {
var x0 = 100,
y0 = 200,
x1 = 150,
y1 = 250,
x2 = 50,
y2 = 50;

gd.once('plotly_selecting', function() {
assertSelectionNodes(1, 2);
});

gd.once('plotly_selected', function() {
assertSelectionNodes(0, 2);
});

gd.once('plotly_deselect', function() {
assertSelectionNodes(0, 0);
});

Lib.clearThrottle();
mouseEvent('mousemove', x0, y0);
assertSelectionNodes(0, 0);

drag([[x0, y0], [x1, y1]]);
doubleClick(x2, y2).then(done);
});
});

describe('select events', function() {
var mockCopy = Lib.extendDeep({}, mock);
mockCopy.layout.dragmode = 'select';
Expand Down