Skip to content

Fix Axes.getAutoRange edge cases #813

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
Aug 8, 2016
Merged

Fix Axes.getAutoRange edge cases #813

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
59b1999
Unit tests for Axes.getAutoRange and Axes.expand
mboorstin Aug 3, 2016
bd40fb0
Fix Axes.getAutoRange rangemode tozero and nonnegative edge cases
mboorstin Aug 3, 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
52 changes: 41 additions & 11 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,27 @@ axes.getAutoRange = function(ax) {
}

if(minmin === maxmax) {
newRange = axReverse ?
[minmin + 1, ax.rangemode !== 'normal' ? 0 : minmin - 1] :
[ax.rangemode !== 'normal' ? 0 : minmin - 1, minmin + 1];
var lower = minmin - 1;
var upper = minmin + 1;
if(ax.rangemode === 'tozero') {
newRange = minmin < 0 ? [lower, 0] : [0, upper];
}
else if(ax.rangemode === 'nonnegative') {
newRange = [Math.max(0, lower), Math.max(0, upper)];
Copy link
Contributor

Choose a reason for hiding this comment

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

nice fix 🎉

}
else {
newRange = [lower, upper];
}
}
else if(mbest) {
if(ax.type === 'linear' || ax.type === '-') {
if(ax.rangemode === 'tozero' && minbest.val >= 0) {
minbest = {val: 0, pad: 0};
if(ax.rangemode === 'tozero') {
if(minbest.val >= 0) {
minbest = {val: 0, pad: 0};
}
if(maxbest.val <= 0) {
maxbest = {val: 0, pad: 0};
}
}
else if(ax.rangemode === 'nonnegative') {
if(minbest.val - mbest * minbest.pad < 0) {
Expand All @@ -193,22 +206,39 @@ axes.getAutoRange = function(ax) {
// in case it changed again...
mbest = (maxbest.val - minbest.val) /
(ax._length - minbest.pad - maxbest.pad);

}

newRange = [
minbest.val - mbest * minbest.pad,
maxbest.val + mbest * maxbest.pad
];
}

// don't let axis have zero size
if(newRange[0] === newRange[1]) {
// don't let axis have zero size, while still respecting tozero and nonnegative
if(newRange[0] === newRange[1]) {
if(ax.rangemode === 'tozero') {
if(newRange[0] < 0) {
newRange = [newRange[0], 0];
}
else if(newRange[0] > 0) {
newRange = [0, newRange[0]];
}
else {
newRange = [0, 1];
}
}
else {
newRange = [newRange[0] - 1, newRange[0] + 1];
if(ax.rangemode === 'nonnegative') {
newRange[0] = Math.max(0, newRange[0]);
}
}
}

// maintain reversal
if(axReverse) {
newRange.reverse();
}
// maintain reversal
if(axReverse) {
newRange.reverse();
}

return newRange;
Expand Down
Loading