Contour legend #2891
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| var d3 = require('d3'); | ||
|
|
||
| var Plotly = require('@lib/index'); | ||
| var Plots = require('@src/plots/plots'); | ||
| var Lib = require('@src/lib'); | ||
|
|
@@ -414,12 +416,12 @@ describe('contour plotting and editing', function() { | |
|
|
||
| function _assert(exp) { | ||
| var msg = ' index in <g.contourlayer> (call #' + cnt + ')'; | ||
| var contourPlot = gd.querySelector('.xy > .plot > .contourlayer > .contour'); | ||
| var hmIndex = -1; | ||
| var contoursIndex = -1; | ||
|
|
||
| for(var i in contourPlot.children) { | ||
| var child = contourPlot.children[i]; | ||
| if(child.querySelector) { | ||
| if(child.querySelector('.hm')) hmIndex = +i; | ||
| else if(child.querySelector('.contourlevel')) contoursIndex = +i; | ||
|
|
@@ -439,21 +441,21 @@ describe('contour plotting and editing', function() { | |
| .then(function() { | ||
| _assert({ | ||
| hmIndex: 0, | ||
| contoursIndex: 3 | ||
|
There was a problem hiding this comment. Oh ok, that's tricky. Now that Maybe we could instead assert: Array.prototype.slice.call(contourPlot.children).map(n => n.classList[0])
// to check ordering
Array.prototype.slice.call(contourPlot.children).map(n => n.children.length)
// to check the number of childrenThere was a problem hiding this comment. Since this is really about layer ordering, which is a consistently testable feature in SVG and likely to be useful elsewhere in our tests, I added a generic custom assertion for this. See what you think e25b9ff There was a problem hiding this comment.
💯 |
||
| }); | ||
| return Plotly.restyle(gd, 'contours.coloring', 'lines'); | ||
| }) | ||
| .then(function() { | ||
| _assert({ | ||
| hmIndex: -1, | ||
| contoursIndex: 3 | ||
| }); | ||
| return Plotly.restyle(gd, 'contours.coloring', 'heatmap'); | ||
| }) | ||
| .then(function() { | ||
| _assert({ | ||
| hmIndex: 0, | ||
| contoursIndex: 3 | ||
| }); | ||
| }) | ||
| .catch(fail) | ||
|
|
@@ -501,4 +503,34 @@ describe('contour plotting and editing', function() { | |
| .catch(fail) | ||
| .then(done); | ||
| }); | ||
|
|
||
| it('keeps the correct ordering after hide and show', function(done) { | ||
|
|
||
| function getIndices() { | ||
| var out = []; | ||
| d3.selectAll('.contour').each(function(d) { out.push(d.trace.index); }); | ||
| return out; | ||
| } | ||
|
|
||
| Plotly.newPlot(gd, [{ | ||
| type: 'contour', | ||
| z: [[1, 2], [3, 4]] | ||
| }, { | ||
| type: 'contour', | ||
| z: [[2, 1], [4, 3]], | ||
| contours: {coloring: 'lines'} | ||
| }]) | ||
| .then(function() { | ||
| expect(getIndices()).toEqual([0, 1]); | ||
| return Plotly.restyle(gd, 'visible', false, [0]); | ||
| }) | ||
| .then(function() { | ||
| expect(getIndices()).toEqual([1]); | ||
| return Plotly.restyle(gd, 'visible', true, [0]); | ||
| }) | ||
| .then(function() { | ||
| expect(getIndices()).toEqual([0, 1]); | ||
| }) | ||
| .catch(fail) | ||
| .then(done); | ||
|
There was a problem hiding this comment. Oh would you mind There was a problem hiding this comment. failTest in contour & carpet -> 7843d83 |
||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yeah. Way better.
By the looks of it,
heatmapandcarpetprobably suffer from similar bugs:From which we could 🔪
getUidsFromCalcdataentirely:No need to do this in this PR of course, but opening a new issue about it would be nice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call -> #2907