Skip to content

Trigger hover and click events on gl3d graphs #240

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 16 commits into from
Feb 25, 2016
Merged

Trigger hover and click events on gl3d graphs #240

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d6ce26
fix broken paths to gl3d images
etpinard Feb 5, 2016
75f243c
pass graphDiv to scene constructor
etpinard Feb 5, 2016
f059957
format hover labels before filtering them
etpinard Feb 5, 2016
fdba7f1
add hover+click event trigger in render loop:
etpinard Feb 5, 2016
a2f61b7
lint
etpinard Feb 5, 2016
930b05a
add 'opts' argument to mouseEvent asset
etpinard Feb 5, 2016
f1c4b61
add gl3d hover and click tests
etpinard Feb 5, 2016
b87dbd0
rm some logic noise
etpinard Feb 8, 2016
2849724
exclude gl_plot_interact_test from local test runs,
etpinard Feb 8, 2016
bd960c9
Merge branch 'master' into gl-hover
etpinard Feb 24, 2016
2e63d1e
enfore a stricter distance req for gl3d click events
etpinard Feb 24, 2016
964a81d
destroy scenes after every gl plot tests
etpinard Feb 24, 2016
f6f2e51
robustify gl interaction tests:
etpinard Feb 24, 2016
eebe7d0
undo 'exclude gl interactions tests'
etpinard Feb 24, 2016
97a4542
rm unnecessary function call
etpinard Feb 25, 2016
fa12603
bump gl-plot3d dep
etpinard Feb 25, 2016
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
enfore a stricter distance req for gl3d click events
  • Loading branch information
@etpinard
etpinard committed Feb 24, 2016
commit 2e63d1ec35c8f479486ad0e17c39b31e5c844531
11 changes: 8 additions & 3 deletions src/plots/gl3d/scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,15 @@ function render(scene) {
});
}

var eventType = (selection.buttons) ? 'plotly_click' : 'plotly_hover',
eventData = makeEventData(xVal, yVal, zVal, trace, selection);
var eventData = makeEventData(xVal, yVal, zVal, trace, selection);
Copy link
Contributor

@mdtusz mdtusz Feb 24, 2016

Choose a reason for hiding this comment

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

Can we just inline this? It doesn't seem to get used anywhere else (as far as I see so far) and if it does, we can make it a function later.

Copy link
Contributor Author

@etpinard etpinard Feb 24, 2016

Choose a reason for hiding this comment

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

good call. Thanks!


if(selection.buttons && selection.distance < 5) {
scene.graphDiv.emit('plotly_click', eventData);
}
else {
scene.graphDiv.emit('plotly_hover', eventData);
Copy link
Contributor Author

@etpinard etpinard Feb 25, 2016

Choose a reason for hiding this comment

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

FYI @cpsievert @cldougl @chriddyp

}

scene.graphDiv.emit(eventType, eventData);
oldEventData = eventData;
}
else {
Expand Down