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.

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 color clustering #2377

Merged
merged 18 commits into from
Feb 22, 2018
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
163 changes: 12 additions & 151 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"regl": "^1.3.1",
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",
Copy link
Contributor

Choose a reason for hiding this comment

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

can you update the package-lock file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

"right-now": "^1.0.0",
"robust-orientation": "^1.1.3",
"sane-topojson": "^2.0.0",
Expand All @@ -119,18 +119,18 @@
"check-node-version": "^3.2.0",
"deep-equal": "^1.0.1",
"ecstatic": "^3.2.0",
"eslint": "^4.17.0",
"eslint": "^4.18.0",
"falafel": "^2.0.0",
"fs-extra": "^2.0.0",
"fuse.js": "^3.2.0",
"glob": "^7.0.0",
"gzip-size": "^4.1.0",
"image-size": "^0.6.2",
"into-stream": "^3.1.0",
"jasmine-core": "^2.4.1",
"jasmine-core": "^2.99.1",
"jsdom": "^11.6.2",
"karma": "^2.0.0",
"karma-browserify": "^5.1.1",
"karma-browserify": "^5.2.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.0.0",
"karma-firefox-launcher": "^1.0.1",
Expand Down
8 changes: 5 additions & 3 deletions src/traces/scattergl/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,9 @@ function plot(container, subplot, cdata) {
}
// fill requires linked traces, so we generate it's positions here
if(scene.fill2d) {
scene.fillOptions.forEach(function(fillOptions, i) {
var fillOptions = scene.fillOptions.map(function(fillOptions, i) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a jasmine test to 🔒 this down?

var cdscatter = cdata[i];
if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return;
if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return {positions: []};
var cd = cdscatter[0];
var trace = cd.trace;
var stash = cd.t;
Expand Down Expand Up @@ -863,9 +863,11 @@ function plot(container, subplot, cdata) {

fillOptions.opacity = trace.opacity;
fillOptions.positions = pos;

return fillOptions;
Copy link
Contributor

@etpinard etpinard Feb 16, 2018

Choose a reason for hiding this comment

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

Can you briefly explain why this fixes #2376 ?

Copy link
Contributor Author

@dy dy Feb 19, 2018

Choose a reason for hiding this comment

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

That fixes #2354. That is internal regl-line2d behavior: when we do line2d.update([opts1, undefined, opts2, ...rest]), the second line in batch is ignored instead of being removed. I made it accept null, indicating that batch item should be removed.

});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);
Copy link
Contributor

Choose a reason for hiding this comment

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

You forgot to git add the json mock corresponding to gl2d_line_select.png

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is the one that accidentally made it into master, as mentioned above

By accident pushed 41c067a to master, this should fix that.

But since I had that in master as the base of my own PR, I removed it there #2379 (comment)

}
}

Expand Down
Binary file added test/image/baselines/gl2d_line_select.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions test/image/mocks/gl2d_scatter-color-clustering.json

Large diffs are not rendered by default.