8000 Faster trace visibility toggling by etpinard · Pull Request #2837 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Faster trace visibility toggling #2837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Faster trace visibility toggling #2837

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e85725a
cleanup in scattergl sceneUpdate & plot
etpinard Jul 23, 2018
1675047
swap visible editType 'calc' -> 'plot'
etpinard Jul 19, 2018
3790734
push trace module into fullLayout._modules even if visible:false
etpinard Jul 23, 2018
cf65abd
use trace.uid-based visible batch array
etpinard Jul 23, 2018
b816a8e
fill in list of visible:true module in fullLayout._visibleModules
etpinard Jul 23, 2018
25ed567
fix and :lock: splom trace visible toggling
etpinard Jul 23, 2018
1f61ff0
adapt scatterpolargl for scene.visibleBatch
etpinard Jul 23, 2018
f1f06f4
add a few comments
etpinard Jul 23, 2018
4af6528
adapt and improve scattergl visible toggle tests
etpinard Jul 23, 2018
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
Prev Previous commit
Next Next commit
use trace.uid-based visible batch array 
... to plot toggle scattergl 'visible' w/o having editType 'calc',
    and hence w/o having to rebuild to scene options from scratch.
  • Loading branch information
@etpinard
etpinard committed Jul 23, 2018
commit cf65abd64816506309fb4d66689cbf6d1fb2d3aa
72 changes: 43 additions & 29 deletions src/traces/scattergl/index.js
View file
Open in desktop 8000
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ function calc(gd, trace) {
stash.positions = positions;
stash.count = count;

scene.uid2batchIndex[trace.uid] = stash.index;
scene.count++;

gd.firstscatter = false;
Expand Down Expand Up @@ -195,6 +196,8 @@ function sceneUpdate(gd, subplot) {
count: 0,
// whether scene requires init hook in plot call (dirty plot call)
dirty: true,
// trace uid to batch index
uid2batchIndex: {},
// last used options
lineOptions: [],
fillOptions: [],
Expand All @@ -209,6 +212,7 @@ function sceneUpdate(gd, subplot) {
};

var initOpts = {
visibleBatch: null,
selectBatch: null,
unselectBatch: null,
// regl- component stubs, initialized in dirty plot call
Expand Down Expand Up @@ -249,38 +253,47 @@ function sceneUpdate(gd, subplot) {

// draw traces in proper order
scene.draw = function draw() {
var i;
for(i = 0; i < scene.count; i++) {
if(scene.fill2d && sce 10000 ne.fillOptions[i]) {
// must do all fills first
scene.fill2d.draw(i);
var visibleBatch = scene.visibleBatch;
var selectBatch = scene.selectBatch;
var unselectBatch = scene.unselectBatch;
var i, b;

// must do all fills first
for(i = 0; i < visibleBatch.length; i++) {
b = visibleBatch[i];
if(scene.fill2d && scene.fillOptions[b]) {
scene.fill2d.draw(b);
}
}
for(i = 0; i < scene.count; i++) {
if(scene.line2d && scene.lineOptions[i]) {
scene.line2d.draw(i);

// traces in no-selection mode
for(i = 0; i < visibleBatch.length; i++) {
b = visibleBatch[i];
if(scene.line2d && scene.lineOptions[b]) {
scene.line2d.draw(b);
}
if(scene.error2d && scene.errorXOptions[i]) {
scene.error2d.draw(i);
if(scene.error2d && scene.errorXOptions[b]) {
scene.error2d.draw(b);
}
if(scene.error2d && scene.errorYOptions[i]) {
scene.error2d.draw(i + scene.count);
if(scene.error2d && scene.errorYOptions[b]) {
scene.error2d.draw(b + scene.count);
}
if(scene.scatter2d && scene.markerOptions[i] && (!scene.selectBatch || !scene.selectBatch[i])) {
// traces in no-selection mode
scene.scatter2d.draw(i);
if(scene.scatter2d && scene.markerOptions[b] && (!selectBatch || !selectBatch[b])) {
scene.scatter2d.draw(b);
}
}

// draw traces in selection mode
if(scene.scatter2d && scene.select2d && scene.selectBatch) {
scene.select2d.draw(scene.selectBatch);
scene.scatter2d.draw(scene.unselectBatch);
if(scene.scatter2d && scene.select2d && selectBatch) {
scene.select2d.draw(selectBatch);
scene.scatter2d.draw(unselectBatch);
}

for(i = 0; i < scene.count; i++) {
if(scene.glText[i] && scene.textOptions[i]) {
scene.glText[i].render();
// draw text, including selected/unselected items
for(i = 0; i < visibleBatch.length; i++) {
b = visibleBatch[i];
if(scene.glText[b] && scene.textOptions[b]) {
scene.glText[b].render();
}
}

Expand Down Expand Up @@ -371,14 +384,13 @@ function plot(gd, subplot, cdata) {
var i, j;

var fullLayout = gd._fullLayout;
var scene = cdata[0][0].t._scene;
var scene = subplot._scene;
var xaxis = subplot.xaxis;
var yaxis = subplot.yaxis;

// we may have more subplots than initialized data due to Axes.getSubplots method
if(!scene) return;


var success = prepareRegl(gd, ['ANGLE_instanced_arrays', 'OES_element_index_uint']);
if(!success) {
scene.init();
Expand Down Expand Up @@ -520,6 +532,7 @@ function plot(gd, subplot, cdata) {
}

// form batch arrays, and check for selected points
scene.visibleBatch = [];
scene.selectBatch = null;
scene.unselectBatch = null;
var dragmode = fullLayout.dragmode;
Expand All @@ -533,6 +546,7 @@ function plot(gd, subplot, cdata) {
var x = stash.x;
var y = stash.y;

scene.visibleBatch.push(batchIndex);

if(trace.selectedpoints || selectMode) {
if(!selectM 83A6 ode) selectMode = true;
Expand All @@ -544,17 +558,17 @@ function plot(gd, subplot, cdata) {

// regenerate scene batch, if traces number changed during selection
if(trace.selectedpoints) {
var selPts = scene.selectBatch[id] = Lib.selIndices2selPoints(trace);
var selPts = scene.selectBatch[batchIndex] = Lib.selIndices2selPoints(trace);

var selDict = {};
for(i = 0; i < selPts.length; i++) {
selDict[selPts[i]] = 1;
for(j = 0; j < selPts.length; j++) {
selDict[selPts[j]] = 1;
}
var unselPts = [];
for(i = 0; i < stash.count; i++) {
if(!selDict[i]) unselPts.push(i);
for(j = 0; j < stash.count; j++) {
if(!selDict[j]) unselPts.push(j);
}
scene.unselectBatch[id] = unselPts;
scene.unselectBatch[batchIndex] = unselPts;
}

// precalculate px coords since we are not going to pan during select
Expand Down
0