Skip to content
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

Fix hover of mesh3d traces with face color and face intensity #4539

Merged
merged 2 commits into from
Jan 31, 2020
+57 −20
Merged

Fix hover of mesh3d traces with face color and face intensity #4539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d348dd0
fix gl-mesh3d hover to return position and index of faces when face-c…
archmoj Jan 31, 2020
d1cb618
bump gl-mesh3d v2.3.0
archmoj Jan 31, 2020
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"gl-heatmap2d": "^1.0.5",
"gl-line3d": "^1.1.11",
"gl-mat4": "^1.2.0",
"gl-mesh3d": "^2.2.1",
"gl-mesh3d": "^2.3.0",
"gl-plot2d": "^1.4.2",
"gl-plot3d": "^2.4.0",
"gl-pointcloud2d": "^1.0.2",
Expand Down
14 changes: 9 additions & 5 deletions src/traces/mesh3d/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ proto.handlePick = function(selection) {
if(selection.object === this.mesh) {
var selectIndex = selection.index = selection.data.index;

selection.traceCoordinate = [
this.data.x[selectIndex],
this.data.y[selectIndex],
this.data.z[selectIndex]
];
if(selection.data._cellCenter) {
selection.traceCoordinate = selection.data.dataCoordinate;
} else {
selection.traceCoordinate = [
this.data.x[selectIndex],
this.data.y[selectIndex],
this.data.z[selectIndex]
];
}

var text = this.data.hovertext || this.data.text;
if(Array.isArray(text) && text[selectIndex] !== undefined) {
Expand Down
1 change: 1 addition & 0 deletions test/image/mocks/gl3d_mesh3d_cell-intensity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,6 +2020,7 @@
"lighting": {
"facenormalsepsilon": 0
},
"hovertemplate": "x: %{x}<br>y: %{y}<br>z: %{z}<br>cell intensity: %{intensity}",
"type": "mesh3d"
}
],
Expand Down
54 changes: 43 additions & 11 deletions test/jasmine/tests/gl3d_hover_click_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var assertHoverLabelContent = customAssertions.assertHoverLabelContent;

var mock = require('@mocks/gl3d_marker-arrays.json');
var mesh3dcoloringMock = require('@mocks/gl3d_mesh3d_coloring.json');
var mesh3dcellIntensityMock = require('@mocks/gl3d_mesh3d_cell-intensity.json');
var multipleScatter3dMock = require('@mocks/gl3d_multiple-scatter3d-traces.json');

// lines, markers, text, error bars and surfaces each
Expand Down Expand Up @@ -554,10 +555,10 @@ describe('Test gl3d trace click/hover:', function() {
.then(delay(20))
.then(function() {
assertHoverText(
'x: 1',
'y: 0',
'x: 0.6666667',
'y: 0.3333333',
'z: 1',
'face color: #0F0',
'face color: #00F',
'face color'
);
})
Expand All @@ -566,8 +567,8 @@ describe('Test gl3d trace click/hover:', function() {
.then(function() {
assertHoverText(
'x: 1',
'y: 1',
'z: 1',
'y: 0.3333333',
'z: 0.6666667',
'face color: #0FF',
'face color'
);
Expand All @@ -577,27 +578,58 @@ describe('Test gl3d trace click/hover:', function() {
.then(function() {
assertHoverText(
'x: 1',
'y: 1',
'z: 0',
'face color: #00F',
'y: 0.6666667',
'z: 0.3333333',
'face color: #0FF',
'face color'
);
})
.then(function() { mouseEvent('mouseover', 200, 300); })
.then(delay(20))
.then(function() {
assertHoverText(
'x: 0',
'x: 0.6666667',
'y: 0',
'z: 0',
'face color: #000',
'z: 0.3333333',
'face color: #F00',
'face color'
);
})
.catch(failTest)
.then(done);
});

it('@gl should display correct face intensities', function(done) {
var fig = mesh3dcellIntensityMock;

Plotly.newPlot(gd, fig)
.then(delay(20))
.then(function() { mouseEvent('mouseover', 200, 200); })
.then(delay(20))
.then(function() {
assertHoverText(
'x: 0.4666667',
'y: 0.4333333',
'z: 0.01583333',
'cell intensity: 0.16',
'trace 0'
);
})
.then(function() { mouseEvent('mouseover', 200, 300); })
.then(delay(20))
.then(function() {
assertHoverText(
'x: 0.7666667',
'y: 0.1333333',
'z: −0.3305',
'cell intensity: 3.04',
'trace 0'
);
})
.catch(failTest)
.then(done);
});

it('@gl should pick latest & closest points on hover if two points overlap', function(done) {
var _mock = Lib.extendDeep({}, mock4);

Expand Down