Refactor scattergl selection #2311
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ var createError = require('regl-error2d'); | |
| var rgba = require('color-normalize'); | ||
| var svgSdf = require('svg-path-sdf'); | ||
| var createRegl = require('regl'); | ||
| var arrayRange = require('array-range'); | ||
| var fillHoverText = require('../scatter/fill_hover_text'); | ||
| var isNumeric = require('fast-isnumeric'); | ||
|
|
||
|
|
@@ -122,7 +123,6 @@ function calc(container, trace) { | |
| } | ||
| } | ||
|
|
||
| calcColorscales(trace); | ||
|
|
||
| var options = sceneOptions(container, subplot, trace, positions); | ||
|
|
@@ -599,6 +599,7 @@ function sceneUpdate(container, subplot) { | |
| scene.error2d.draw(i); | ||
| scene.error2d.draw(i + scene.count); | ||
| } | ||
|
|
||
| if(scene.scatter2d && !scene.selectBatch) { | ||
| scene.scatter2d.draw(i); | ||
| } | ||
|
|
@@ -740,8 +741,9 @@ function plot(container, subplot, cdata) { | |
| if(!cdata.length) return; | ||
|
|
||
| var layout = container._fullLayout; | ||
| var scene = cdata[0][0].t.scene; | ||
| var i; | ||
| var dragmode = layout.dragmode; | ||
|
|
||
| // we may have more subplots than initialized data due to Axes.getSubplots method | ||
| if(!scene) return; | ||
|
|
@@ -782,6 +784,7 @@ function plot(container, subplot, cdata) { | |
| scene.fill2d = createLine(regl); | ||
| } | ||
|
|
||
| // update main marker options | ||
| if(scene.line2d) { | ||
| scene.line2d.update(scene.lineOptions); | ||
| } | ||
|
|
@@ -790,13 +793,7 @@ function plot(container, subplot, cdata) { | |
| scene.error2d.update(errorBatch); | ||
| } | ||
| if(scene.scatter2d) { | ||
| scene.scatter2d.update(scene.markerOptions); | ||
| } | ||
| // fill requires linked traces, so we generate it's positions here | ||
| if(scene.fill2d) { | ||
|
|
@@ -886,17 +883,77 @@ function plot(container, subplot, cdata) { | |
|
|
||
| scene.fill2d.update(scene.fillOptions); | ||
| } | ||
|
|
||
|
|
||
| // update selection | ||
|
There was a problem hiding this comment. Separated code chunks are in single location now There was a problem hiding this comment. On the
There was a problem hiding this comment. Should be fixed with 98cddf3 |
||
| var hasSelectedPoints = false; | ||
| for(i = 0; i < cdata.length; i++) { | ||
| if(cdata[i][0].trace.selectedpoints) { | ||
| hasSelectedPoints = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if(scene.selectBatch || dragmode === 'lasso' || dragmode === 'select' || hasSelectedPoints) { | ||
| var newSelectBatch, newUnselectBatch; | ||
|
|
||
| // create select2d | ||
| if(!scene.select2d) { | ||
| // create scatter instance by cloning scatter2d | ||
| scene.select2d = createScatter(layout._glcanvas.data()[1].regl, {clone: scene.scatter2d}); | ||
| } | ||
|
|
||
| // regenerate scene batch, if traces number changed during selection | ||
| if(scene.selectBatch || hasSelectedPoints) { | ||
| if(!scene.selectBatch) scene.selectBatch = []; | ||
| if(!scene.unselectBatch) scene.unselectBatch = []; | ||
|
|
||
| newSelectBatch = Array(scene.count); | ||
| newUnselectBatch = Array(scene.count); | ||
|
|
||
| for(var j = 0; j < newSelectBatch.length; j++) { | ||
| var trace = cdata[j][0].trace; | ||
| var stash = cdata[j][0].t; | ||
| var id = stash.index; | ||
|
|
||
| // form unselected batch | ||
| if(!scene.unselectBatch[id]) { | ||
| if(trace.selectedpoints) { | ||
| newSelectBatch[id] = trace.selectedpoints; | ||
| var selPts = trace.selectedpoints; | ||
| var selDict = {}; | ||
| for(i = 0; i < selPts.length; i++) { | ||
| selDict[selPts[i]] = true; | ||
| } | ||
| var unselPts = []; | ||
| for(i = 0; i < stash.count; i++) { | ||
| if(!selDict[i]) unselPts.push(i); | ||
| } | ||
| newUnselectBatch[id] = unselPts; | ||
| } | ||
| else { | ||
| newSelectBatch[id] = []; | ||
| newUnselectBatch[id] = arrayRange(stash.count); | ||
| } | ||
| } | ||
| else { | ||
| newSelectBatch[id] = scene.selectBatch[id]; | ||
| newUnselectBatch[id] = scene.unselectBatch[id]; | ||
| } | ||
| } | ||
|
|
||
| scene.selectBatch = newSelectBatch; | ||
| scene.unselectBatch = newUnselectBatch; | ||
|
|
||
| scene.scatter2d.update(scene.unselectedOptions); | ||
| } | ||
|
|
||
| scene.select2d.update(scene.markerOptions); | ||
| scene.select2d.update(scene.selectedOptions); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // provide viewport and range | ||
| var vpRange = cdata.map(function(cdscatter) { | ||
| if(!cdscatter || !cdscatter[0] || !cdscatter[0].trace) return; | ||
|
|
@@ -925,41 +982,6 @@ function plot(container, subplot, cdata) { | |
| ]; | ||
|
|
||
| if(trace.selectedpoints || dragmode === 'lasso' || dragmode === 'select') { | ||
| // precalculate px coords since we are not going to pan during select | ||
| var xpx = Array(stash.count), ypx = Array(stash.count); | ||
| for(i = 0; i < stash.count; i++) { | ||
|
|
@@ -1193,18 +1215,18 @@ function selectPoints(searchInfo, polygon) { | |
| } | ||
| } | ||
| else { | ||
| unels = arrayRange(stash.count); | ||
| } | ||
|
|
||
| // make sure selectBatch is created | ||
| if(!scene.selectBatch) { | ||
| scene.selectBatch = []; | ||
| scene.unselectBatch = []; | ||
|
|
||
| // we should turn scatter2d into unselected once we have any points selected | ||
| scene.scatter2d.update(scene.unselectedOptions); | ||
| } | ||
|
|
||
| scene.selectBatch[stash.index] = els; | ||
| scene.unselectBatch[stash.index] = unels; | ||
|
|
||
|
|
||
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.
Looks good. Thanks!
I think the best way to test this would be to spy on
ScatterGl.calcchecking thatPlotly.relayout(gd, 'opacity', /**/)does invoke it - similar to this suite.