Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Fix color clustering - #2377

Merged
etpinard merged 18 commits into
masterfrom
regl-scatter-fix
Feb 22, 2018
Merged

Fix color clustering#2377
etpinard merged 18 commits into
masterfrom
regl-scatter-fix

Conversation

@dy

@dydy commented Feb 16, 2018

Copy link
Copy Markdown
Contributor

That fixes#2376, #2374 and #2354.
By accident pushed 41c067a to master, this should fix that.

cc @alexcjohnson@etpinard

  • add baseline images

@dy
dy requested a review from etpinardFebruary 16, 2018 20:07
Comment threadpackage.json Outdated
"regl-error2d": "^2.0.3",
"regl-line2d": "^2.1.4",
"regl-scatter2d": "^2.1.13",
"regl-scatter2d": "^2.1.16",

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadsrc/traces/scattergl/index.js Outdated
});

scene.fill2d.update(scene.fillOptions);
scene.fill2d.update(fillOptions);

Copy link
Copy Markdown
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
Copy Markdown
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)

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

return fillOptions;

@etpinardetpinardFeb 16, 2018

Copy link
Copy Markdown
Contributor

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 ?

@dydyFeb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

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.

Comment threadsrc/traces/scattergl/index.js Outdated
// 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
Copy Markdown
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?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

Playing with this branch - looking great up to 90K points!
90k points
But then something changes, kind of gradually between 90K and 92K - here's 92K, where it looks like the marker outline colors pick randomly from the marker colors?
92k points
Then go a bit farther and the marker colors also get randomized - here's 100K points.
100k points

The code I used for this is (basically copied from one of the issue codepens):

varx_array=[],color_array=[],opacity=[],size=[];for(vari=0;i<N;i++){// N = eg 90000, 92000, 100000x_array.push(i);color_array.push(Math.random());opacity.push(Math.random());size.push(Math.random()*3+3);}vartrace1={x: x_array,y: color_array,mode: 'markers',marker: {size: size,color: color_array,opacity: opacity,colorscale: [[0,'rgb(255, 0, 0)'],[0.5,'rgb(0, 255, 0)'],[1.0,'rgb(0, 0, 255)']]},type: 'scattergl'};varlayout={title: 'Scatter Plot with a Color Dimension'};Plotly.newPlot(gd,[trace1],layout);

@alexcjohnsonalexcjohnson mentioned this pull request Feb 17, 2018
@dy

dy commented Feb 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Comment threadpackage-lock.json
"update-diff": "1.1.0"
}
},
"regl-scatter2d": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this gone?

Comment threadpackage-lock.json Outdated
"version": "0.44.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.44.0.tgz",
"integrity": "sha512-vMeZaLXjG1B1BKOD9HB11sb9UIUvbzXWJu0NR38j9Uyp1h5xUXqh1Rqe+EhxQp3jzlHIv/LVhFKCJjQQKA2LoA==",
"version": "0.44.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we not bump mapbox-gl in this PR?

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson that is regl limitation of uint32 buffers, we can't go over 65536 various colors, that is reached at ~91k points.

Makes sense, but we need to do something reasonable in this case (which should be well within the range that scattergl is expected to support), and not have it break like this. My eyes can't distinguish 65k colors, so we should be able to find a way to discretize the colors to fit within that limit.

@dy

dy commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@alexcjohnson fixed by d604a76

@alexcjohnson

Copy link
Copy Markdown
Collaborator

@alexcjohnson fixed by d604a76

Beautiful! Here's 1M points now, looks lovely.
screen shot 2018-02-19 at 10 47 54 pm

Is there an obvious way to test this? I wouldn't want to make a mock with 100k or more points in it, is there a way to trigger the difference at a lower volume? Or perhaps draw something like this programmatically (but not random like in my test) and read a few pixels?


for(var i = 0; i < N; i++) {
x.push(i);
color.push(Math.random());

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

maybe I'm being paranoid, but I still don't like random in tests. Can we do something repeatable like

varrandSeed=2000000000;
functionseed(){
randSeed=2000000000;
}
functionrand(){
varlastVal=randSeed;
randSeed=(69069*randSeed+1)%4294967296;
// don't let consecutive vals be too close together
// gets away from really trying to be random, in favor of better local uniformity
if(Math.abs(randSeed-lastVal)<429496729)returnrand();
returnrandSeed/4294967296;
}
?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ha right. Good call!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done via
20c3a00 and eae6da2

Comment threadsrc/lib/index.js
randSeed = 2000000000;
};

lib.pseudoRandom = function() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Great idea - I bet we'll find other places this should be used too.

@alexcjohnson

Copy link
Copy Markdown
Collaborator

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

Merging master 1154589 includes the commit where I 🔪 gl2d_line_select.json, right? I don't see it generated in https://circleci.com/gh/plotly/plotly.js/7082#artifacts/containers/0. So now we need to add it back into this PR. After that this looks great to me! 💃

@etpinard

etpinard commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Merging master 1154589 includes the commit where I gl2d_line_select.json, right? I

Good 👁️ with commit f8b4e52 we get:

image

Some weird things happened on CI during this push, so I decided to bump glslify to get clean npm i through. This partly fixes #2386


@dfcreative anything else you may want to add to this PR?

@dy

dy commented Feb 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@etpinard so far looks great, thanks a lot for helping out! 💃

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scattergl lines don't show up under select/lasso drag modes

3 participants

@dy@alexcjohnson@etpinard