Skip to content

Make deleteTrace handle big-indices-array properly [fixes #201] #203

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

Merged
merged 4 commits into from
Jan 21, 2016
Merged

Make deleteTrace handle big-indices-array properly [fixes #201] #203

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5daacb
add descending sorter function
etpinard Jan 20, 2016
b7281b4
use descending sorter in deleteTrace:
etpinard Jan 20, 2016
9aa06d2
add deleteTrace test for big indice arrays
etpinard Jan 20, 2016
15e7309
export descending sorter as `sorterDes`
etpinard Jan 21, 2016
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
1 change: 1 addition & 0 deletions src/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ lib.parseDate = datesModule.parseDate;
var searchModule = require('./search');
lib.findBin = searchModule.findBin;
lib.sorterAsc = searchModule.sorterAsc;
lib.sorterDec = searchModule.sorterDes;
Copy link
Contributor

@mdtusz mdtusz Jan 20, 2016

Choose a reason for hiding this comment

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

Decreasing or Descending?

We should keep it consistent with increasing/inc and decreasing/dec or ascending/asc and descending/des.

Copy link
Contributor Author

@etpinard etpinard Jan 20, 2016

Choose a reason for hiding this comment

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

Thanks good catch.

I was thinking of Descending. So sorterDes is OK? I have no preference.

Copy link
Contributor

@mdtusz mdtusz Jan 20, 2016

Choose a reason for hiding this comment

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

No preference here either. Descending probably makes a bit more sense though.

lib.distinctVals = searchModule.distinctVals;
lib.roundUp = searchModule.roundUp;

Expand Down
1 change: 1 addition & 0 deletions src/lib/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ function greaterThan(a, b) { return a > b; }
function greaterOrEqual(a, b) { return a >= b; }

exports.sorterAsc = function(a, b) { return a - b; };
exports.sorterDes = function(a, b) { return b - a; };

/**
* find distinct values in an array, lumping together ones that appear to
Expand Down
2 changes: 1 addition & 1 deletion src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ Plotly.deleteTraces = function deleteTraces(gd, indices) {
indices = positivifyIndices(indices, gd.data.length - 1);

// we want descending here so that splicing later doesn't affect indexing
indices.sort().reverse();
indices.sort(Lib.sorterDec);
for (i = 0; i < indices.length; i += 1) {
deletedTrace = gd.data.splice(indices[i], 1)[0];
traces.push(deletedTrace);
Expand Down
26 changes: 26 additions & 0 deletions test/jasmine/tests/plot_api_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,32 @@ describe('Test plot api', function() {

});

it('should work with more than 10 indices', function() {
gd.data = [];

for(var i = 0; i < 20; i++) {
gd.data.push({
name: 'trace #' + i
});
}

var expectedData = [
{name: 'trace #12'},
{name: 'trace #13'},
{name: 'trace #14'},
{name: 'trace #15'},
{name: 'trace #16'},
{name: 'trace #17'},
{name: 'trace #18'},
{name: 'trace #19'}
];

Plotly.deleteTraces(gd, [0,1,2,3,4,5,6,7,8,9,10,11]);
expect(gd.data).toEqual(expectedData);
expect(PlotlyInternal.redraw).toHaveBeenCalled();

});

});

describe('Plotly.addTraces', function() {
Expand Down