Skip to content
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

Handle case of nonnegative or tozero rangemodes for inside ticklabels #5331

Merged
merged 6 commits into from
Dec 9, 2020
Merged

Handle case of nonnegative or tozero rangemodes for inside ticklabels #5331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc38ade
handle case of nonnegative rangemode for inside ticklabels
archmoj Dec 9, 2020
f31d97c
should not depend on the rangemode of counter axis
archmoj Dec 9, 2020
be762b6
Revert "should not depend on the rangemode of counter axis"
archmoj Dec 9, 2020
15b002a
set nopad instead of zero pad
archmoj Dec 9, 2020
0b254e7
remove one unnecessary check - improve tests
archmoj Dec 9, 2020
4bb0995
remove second check
archmoj Dec 9, 2020
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
17 changes: 10 additions & 7 deletions src/plots/cartesian/autorange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ function getAutoRange(gd, ax) {
} else if(dv / axLen > mbest) {
// in case of padding longer than the axis
// at least include the unpadded data values.
minbest = {val: minpt.val, pad: 0};
maxbest = {val: maxpt.val, pad: 0};
minbest = {val: minpt.val, nopad: 1};
maxbest = {val: maxpt.val, nopad: 1};
mbest = dv / axLen;
}
}
Expand Down Expand Up @@ -158,17 +158,17 @@ function getAutoRange(gd, ax) {
} else {
if(toZero) {
if(minbest.val >= 0) {
minbest = {val: 0, pad: 0};
minbest = {val: 0, nopad: 1};
}
if(maxbest.val <= 0) {
maxbest = {val: 0, pad: 0};
maxbest = {val: 0, nopad: 1};
}
} else if(nonNegative) {
if(minbest.val - mbest * getPadMin(minbest) < 0) {
minbest = {val: 0, pad: 0};
minbest = {val: 0, nopad: 1};
}
if(maxbest.val <= 0) {
maxbest = {val: 1, pad: 0};
maxbest = {val: 1, nopad: 1};
}
}

Expand Down Expand Up @@ -240,7 +240,10 @@ function makePadFn(fullLayout, ax, max) {
(ax.domain[1] - ax.domain[0]);
}

return function getPad(pt) { return pt.pad + (pt.extrapad ? extrappad : zero); };
return function getPad(pt) {
if(pt.nopad) return 0;
return pt.pad + (pt.extrapad ? extrappad : zero);
};
}

var TEXTPAD = 3;
Expand Down
Binary file added test/image/baselines/ticklabelposition-5.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/image/baselines/ticklabelposition-6.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
187 changes: 187 additions & 0 deletions test/image/mocks/ticklabelposition-5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
{
"data": [{
"xaxis": "x",
"yaxis": "y",
"type": "bar",
"orientation": "h",
"x": [
67.5,
23.3,
5.2,
1.8,
0.8,
0.7,
0.23,
0.1,
0.1
],
"y": [
"Hydro",
"Solid biomass",
"Wind",
"Ethanol",
"Renewable municipal waste",
"Solar thermal",
"Biodiesel",
"Solar photovoltaic",
"Tidal"
]
}, {
"xaxis": "x2",
"yaxis": "y2",
"type": "bar",
"orientation": "h",
"x": [
67.5,
23.3,
5.2,
1.8,
0.8,
0.7,
0.23,
0.1,
0.1
],
"y": [
"Hydro",
"Solid biomass",
"Wind",
"Ethanol",
"Renewable municipal waste",
"Solar thermal",
"Biodiesel",
"Solar photovoltaic",
"Tidal"
]
}, {
"xaxis": "x3",
"yaxis": "y3",
"type": "bar",
"orientation": "v",
"y": [
67.5,
23.3,
5.2,
1.8,
0.8,
0.7,
0.23,
0.1,
0.1
],
"x": [
"Hydro",
"Solid biomass",
"Wind",
"Ethanol",
"Renewable municipal waste",
"Solar thermal",
"Biodiesel",
"Solar photovoltaic",
"Tidal"
]
}, {
"xaxis": "x4",
"yaxis": "y4",
"type": "bar",
"orientation": "v",
"y": [
67.5,
23.3,
5.2,
1.8,
0.8,
0.7,
0.23,
0.1,
0.1
],
"x": [
"Hydro",
"Solid biomass",
"Wind",
"Ethanol",
"Renewable municipal waste",
"Solar thermal",
"Biodiesel",
"Solar photovoltaic",
"Tidal"
]
}],
"layout": {
"xaxis": {
"rangemode": "nonnegative",
"anchor": "y",
"domain": [0, 0.475],
"side": "bottom",
"ticklabelposition": "outside",
"gridcolor": "white"
},
"yaxis": {
"anchor": "x",
"domain": [0, 0.475],
"side": "left",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"xaxis2": {
"rangemode": "nonnegative",
"anchor": "y2",
"domain": [0.525, 1],
"side": "bottom",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"yaxis2": {
"anchor": "x2",
"domain": [0, 0.475],
"side": "right",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"xaxis3": {
"anchor": "y3",
"domain": [0.525, 1],
"side": "top",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"yaxis3": {
"rangemode": "nonnegative",
"anchor": "x3",
"domain": [0.525, 1],
"side": "right",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"xaxis4": {
"anchor": "y4",
"domain": [0, 0.475],
"side": "top",
"ticklabelposition": "inside",
"gridcolor": "white"
},
"yaxis4": {
"autorange": "reversed",
"rangemode": "nonnegative",
"anchor": "x4",
"domain": [0.525, 1],
"side": "left",
"ticklabelposition": "outside",
"gridcolor": "white"
},
"font": {
"size": 16
},
"plot_bgcolor": "lightblue",
"showlegend": false,
"width": 800,
"height": 800,
"margin": {
"t": 40,
"b": 40,
"l": 40,
"r": 40
}
}
}
90 changes: 90 additions & 0 deletions test/image/mocks/ticklabelposition-6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"data": [{
"xaxis": "x",
"yaxis": "y",
"orientation": "h",
"x": [0.4, 0.5, 0.6, 0.7, 0.8],
"y": ["Oo", "Pp", "Qq", "Rr", "Ss"]
}, {
"xaxis": "x2",
"yaxis": "y2",
"orientation": "h",
"x": [0.4, 0.5, 0.6, 0.7, 0.8],
"y": ["Oo", "Pp", "Qq", "Rr", "Ss"]
}, {
"xaxis": "x3",
"yaxis": "y3",
"orientation": "v",
"y": [0.4, 0.5, 0.6, 0.7, 0.8],
"x": ["Oo", "Pp", "Qq", "Rr", "Ss"]
}, {
"xaxis": "x4",
"yaxis": "y4",
"orientation": "v",
"y": [0.4, 0.5, 0.6, 0.7, 0.8],
"x": ["Oo", "Pp", "Qq", "Rr", "Ss"]
}],
"layout": {
"xaxis": {
"rangemode": "nonnegative",
"anchor": "y",
"domain": [0, 0.475],
"gridcolor": "white"
},
"yaxis": {
"anchor": "x",
"domain": [0, 0.475],
"ticklabelposition": "inside",
"gridcolor": "white"
},
"xaxis2": {
"rangemode": "tozero",
"anchor": "y2",
"domain": [0.525, 1],
"gridcolor": "white"
},
"yaxis2": {
"anchor": "x2",
"domain": [0, 0.475],
"ticklabelposition": "inside",
"gridcolor": "white"
},
"xaxis3": {
"anchor": "y3",
"domain": [0.525, 1],
"ticklabelposition": "inside",
"gridcolor": "white"
},
"yaxis3": {
"rangemode": "nonnegative",
"anchor": "x3",
"domain": [0.525, 1],
"gridcolor": "white"
},
"xaxis4": {
"anchor": "y4",
"domain": [0, 0.475],
"ticklabelposition": "inside",
"gridcolor": "white"
},
"yaxis4": {
"rangemode": "tozero",
"anchor": "x4",
"domain": [0.525, 1],
"gridcolor": "white"
},
"font": {
"size": 20
},
"plot_bgcolor": "lightblue",
"showlegend": false,
"width": 800,
"height": 800,
"margin": {
"t": 40,
"b": 40,
"l": 40,
"r": 40
}
}
}