Skip to content

Clear parcoords canvas specially if no panels exist #1440

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/traces/parcoords/lines.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,11 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, initialDim
}
}

if(panelCount === 0) {
// clear canvas here, as the panel iteration below will not enter the loop body
clear(regl, 0, 0, canvasWidth, canvasHeight);
}

for(I = 0; I < panelCount; I++) {
var panel = panels[I];
var dim1 = panel.dim1;
Expand Down Expand Up @@ -396,10 +401,23 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, initialDim
return pickPixel;
}

function readPixels(canvasX, canvasY, width, height) {
var pixelArray = new Uint8Array(4 * width * height);
regl.read({
x: canvasX,
y: canvasY,
width: width,
height: height,
data: pixelArray
});
return pixelArray;
}

return {
setColorDomain: setColorDomain,
render: renderGLParcoords,
readPixel: readPixel,
readPixels: readPixels,
destroy: regl.destroy
};
};
4 changes: 2 additions & 2 deletions src/traces/parcoords/parcoords.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ function model(layout, d, i) {
canvasOverdrag: c.overdrag * c.canvasPixelRatio
});

var groupWidth = width * (domain.x[1] - domain.x[0]);
var groupHeight = layout.height * (domain.y[1] - domain.y[0]);
var groupWidth = Math.floor(width * (domain.x[1] - domain.x[0]));
var groupHeight = Math.floor(layout.height * (domain.y[1] - domain.y[0]));

var pad = layout.margin || {l: 80, r: 80, t: 100, b: 80};
var rowContentWidth = groupWidth;
Expand Down
Binary file modified test/image/baselines/gl2d_parcoords_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions test/jasmine/tests/parcoords_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,36 @@ describe('parcoords', function() {
});
});

it('Calling `Plotly.restyle` with zero panels left should erase lines', function(done) {

var mockCopy = Lib.extendDeep({}, mock2);
var gd = createGraphDiv();
Plotly.plot(gd, mockCopy.data, mockCopy.layout);

function restyleDimension(key, dimIndex, setterValue) {
var value = Lib.isArray(setterValue) ? setterValue[0] : setterValue;
return function() {
return Plotly.restyle(gd, 'dimensions[' + dimIndex + '].' + key, setterValue).then(function() {
expect(gd.data[0].dimensions[dimIndex][key]).toEqual(value, 'for dimension attribute \'' + key + '\'');
});
};
}

restyleDimension('values', 1, [[]])()
.then(function() {
d3.selectAll('.parcoords-lines').each(function(d) {
var imageArray = d.lineLayer.readPixels(0, 0, d.model.canvasWidth, d.model.canvasHeight);
var foundPixel = false;
var i = 0;
do {
foundPixel = foundPixel || imageArray[i++] !== 0;
} while(!foundPixel && i < imageArray.length);
expect(foundPixel).toEqual(false);
});
done();
});
});

describe('Having two datasets', function() {

it('Two subsequent calls to Plotly.plot should create two parcoords rows', function(done) {
Expand Down