8000 Log bar autorange fix by alexcjohnson · Pull Request #1475 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Log bar autorange fix #1475

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 2 commits into from
Mar 14, 2017
Merged

Log bar autorange fix #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b9e739
test bars with log autorange
alexcjohnson Mar 14, 2017
fc977a1
fix bars with log autorange
alexcjohnson Mar 14, 2017
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
78 changes: 32 additions & 46 deletions src/traces/bar/set_positions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,15 +449,22 @@ function updatePositionAxis(gd, pa, sieve, allowMinDtick) {
Axes.expand(pa, [pMin, pMax], {padded: false});
}

function expandRange(range, newValue) {
if(isNumeric(range[0])) range[0] = Math.min(range[0], newValue);
else range[0] = newValue;

if(isNumeric(range[1])) range[1] = Math.max(range[1], newValue);
else range[1] = newValue;
}

function setBaseAndTop(gd, sa, sieve) {
// store these bar bases and tops in calcdata
// and make sure the size axis includes zero,
// along with the bases and tops of each bar.
var traces = sieve.traces,
sLetter = getAxisLetter(sa),
sMax = sa.l2c(sa.c2l(0)),
sMin = sMax;
s0 = sa.l2c(sa.c2l(0)),
sRange = [s0, s0];

for(var i = 0; i < traces.length; i++) {
var trace = traces[i];
Expand All @@ -469,18 +476,12 @@ function setBaseAndTop(gd, sa, sieve) {

bar[sLetter] = barTop;

if(isNumeric(sa.c2l(barTop))) {
sMax = Math.max(sMax, barTop);
sMin = Math.min(sMin, barTop);
}
if(isNumeric(sa.c2l(barBase))) {
sMax = Math.max(sMax, barBase);
sMin = Math.min(sMin, barBase);
}
if(isNumeric(sa.c2l(barTop))) expandRange(sRange, barTop);
if(isNumeric(sa.c2l(barBase))) expandRange(sRange, barBase);
}
}

Axes.expand(sa, [sMin, sMax], {tozero: true, padded: true});
Axes.expand(sa, sRange, {tozero: true, padded: true});
}


Expand All @@ -492,8 +493,8 @@ function stackBars(gd, sa, sieve) {
i, trace,
j, bar;

var sMax = sa.l2c(sa.c2l(0)),
sMin = sMax;
var s0 = sa.l2c(sa.c2l(0)),
sRange = [s0, s0];

for(i = 0; i < traces.length; i++) {
trace = traces[i];
Expand All @@ -512,20 +513,14 @@ function stackBars(gd, sa, sieve) {
bar[sLetter] = barTop;

if(!barnorm) {
if(isNumeric(sa.c2l(barTop))) {
sMax = Math.max(sMax, barTop);
sMin = Math.min(sMin, barTop);
}
if(isNumeric(sa.c2l(barBase))) {
sMax = Math.max(sMax, barBase);
sMin = Math.min(sMin, barBase);
}
if(isNumeric(sa.c2l(barTop))) expandRange(sRange, barTop);
if(isNumeric(sa.c2l(barBase))) expandRange(sRange, barBase);
}
}
}

// if barnorm is set, let normalizeBars update the axis range
if(!barnorm) Axes.expand(sa, [sMin, sMax], {tozero: true, padded: true});
if(!barnorm) Axes.expand(sa, sRange, {tozero: true, padded: true});
}


Expand Down Expand Up @@ -554,10 +549,20 @@ function normalizeBars(gd, sa, sieve) {
sLetter = getAxisLetter(sa),
sTop = (gd._fullLayout.barnorm === 'fraction') ? 1 : 100,
sTiny = sTop / 1e9, // in case of rounding error in sum
sMin = 0,
sMax = (gd._fullLayout.barmode === 'stack') ? sTop : 0,
sMin = sa.l2c(sa.c2l(0)),
sMax = (gd._fullLayout.barmode === 'stack') ? sTop : sMin,
sRange = [sMin, sMax],
padded = false;

function maybeExpand(newValue) {
if(isNumeric(sa.c2l(newValue)) &&
((newValue < sMin - sTiny) || (newValue > sMax + sTiny) || !isNumeric(sMin))
) {
padded = true;
expandRange(sRange, newValue);
}
}

for(var i = 0; i < traces.length; i++) {
var trace = traces[i];

Expand All @@ -574,32 +579,13 @@ function normalizeBars(gd, sa, sieve) {
barTop = barBase + bar.s;
bar[sLetter] = barTop;

if(isNumeric(sa.c2l(barTop))) {
if(barTop < sMin - sTiny) {
padded = true;
sMin = barTop;
}
if(barTop > sMax + sTiny) {
padded = true;
sMax = barTop;
}
}

if(isNumeric(sa.c2l(barBase))) {
if(barBase < sMin - sTiny) {
padded = true;
sMin = barBase;
}
if(barBase > sMax + sTiny) {
padded = true;
sMax = barBase;
}
}
maybeExpand(barTop);
maybeExpand(barBase);
Copy link
Contributor

Choose a reason for hiding this comment

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

very nice simplification.

}
}

// update range of size axis
Axes.expand(sa, [sMin, sMax], {tozero: true, padded: padded});
Axes.expand(sa, sRange, {tozero: true, padded: padded});
}


Expand Down
43 changes: 42 additions & 1 deletion test/jasmine/tests/bar_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('Bar.supplyDefaults', function() {
});
});

describe('heatmap calc / setPositions', function() {
describe('bar calc / setPositions', function() {
'use strict';

beforeAll(function() {
Expand Down Expand Up @@ -697,6 +697,47 @@ describe('Bar.setPositions', function() {
expect(gd.calcdata[1][0].placeholder).toBe(true);
expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
});

it('works with log axes (grouped bars)', function() {
var gd = mockBarPlot([
{y: [1, 10, 1e10, -1]},
{y: [2, 20, 2e10, -2]}
], {
yaxis: {type: 'log'},
barmode: 'group'
});

var ya = gd._fullLayout.yaxis;
expect(Axes.getAutoRange(ya)).toBeCloseToArray([-0.572, 10.873], undefined, '(ya.range)');
});

it('works with log axes (stacked bars)', function() {
var gd = mockBarPlot([
{y: [1, 10, 1e10, -1]},
{y: [2, 20, 2e10, -2]}
], {
yaxis: {type: 'log'},
barmode: 'stack'
});

var ya = gd._fullLayout.yaxis;
expect(Axes.getAutoRange(ya)).toBeCloseToArray([-0.582, 11.059], undefined, '(ya.range)');
});

it('works with log axes (normalized bars)', function() {
// strange case... but it should work!
var gd = mockBarPlot([
{y: [1, 10, 1e10, -1]},
{y: [2, 20, 2e10, -2]}
], {
yaxis: {type: 'log'},
barmode: 'stack',
barnorm: 'percent'
});

var ya = gd._fullLayout.yaxis;
expect(Axes.getAutoRange(ya)).toBeCloseToArray([1.496, 2.027], undefined, '(ya.range)');
Copy link
Contributor
@etpinard etpinard Mar 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Nice tests! I wouldn't be opposed to adding a bar log image test too if you're up for it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Could be nice, but for now I think I'd better move on.

});
});

describe('A bar plot', function() {
Expand Down
0