Skip to content

support 'e' and 'E' exponentformat on log axes #2921

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
Aug 20, 2018
Merged

support 'e' and 'E' exponentformat on log axes #2921

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
4160081
support 'e' and 'E' exponentformat on log axes
alexcjohnson Aug 17, 2018
6c00814
fix bugs I introduced with my "cleanup" while adding log e/E format
alexcjohnson Aug 17, 2018
58700c1
update mocks 12 & 14 which used log e exponentformat when they wanted…
alexcjohnson Aug 17, 2018
488bcf4
fix a test that depended on mock 14
alexcjohnson Aug 17, 2018
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
36 changes: 20 additions & 16 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,9 +1079,10 @@ function formatDate(ax, out, hover, extraPrecision) {
}

function formatLog(ax, out, hover, extraPrecision, hideexp) {
var dtick = ax.dtick,
x = out.x,
tickformat = ax.tickformat;
var dtick = ax.dtick;
var x = out.x;
var tickformat = ax.tickformat;
var dtChar0 = typeof dtick === 'string' && dtick.charAt(0);

if(hideexp === 'never') {
// If this is a hover label, then we must *never* hide the exponent
Expand All @@ -1093,30 +1094,36 @@ function formatLog(ax, out, hover, extraPrecision, hideexp) {
hideexp = '';
}

if(extraPrecision && ((typeof dtick !== 'string') || dtick.charAt(0) !== 'L')) dtick = 'L3';
if(extraPrecision && (dtChar0 !== 'L')) {
dtick = 'L3';
dtChar0 = 'L';
}

if(tickformat || (typeof dtick === 'string' && dtick.charAt(0) === 'L')) {
if(tickformat || (dtChar0 === 'L')) {
out.text = numFormat(Math.pow(10, x), ax, hideexp, extraPrecision);
}
else if(isNumeric(dtick) || ((dtick.charAt(0) === 'D') && (Lib.mod(x + 0.01, 1) < 0.1))) {
else if(isNumeric(dtick) || ((dtChar0 === 'D') && (Lib.mod(x + 0.01, 1) < 0.1))) {
var p = Math.round(x);
if(['e', 'E', 'power'].indexOf(ax.exponentformat) !== -1 ||
(isSIFormat(ax.exponentformat) && beyondSI(p))) {
var absP = Math.abs(p);
var exponentFormat = ax.exponentformat;
if(exponentFormat === 'power' || (isSIFormat(exponentFormat) && beyondSI(p))) {
if(p === 0) out.text = 1;
else if(p === 1) out.text = '10';
else if(p > 1) out.text = '10<sup>' + p + '</sup>';
else out.text = '10<sup>' + MINUS_SIGN + -p + '</sup>';
else out.text = '10<sup>' + (p > 1 ? '' : MINUS_SIGN) + absP + '</sup>';

out.fontSize *= 1.25;
}
else if((exponentFormat === 'e' || exponentFormat === 'E') && absP > 2) {
out.text = '1' + exponentFormat + (p > 0 ? '+' : MINUS_SIGN) + absP;
}
else {
out.text = numFormat(Math.pow(10, x), ax, '', 'fakehover');
if(dtick === 'D1' && ax._id.charAt(0) === 'y') {
out.dy -= out.fontSize / 6;
}
}
}
else if(dtick.charAt(0) === 'D') {
else if(dtChar0 === 'D') {
out.text = String(Math.round(Math.pow(10, Lib.mod(x, 1))));
out.fontSize *= 0.75;
}
Expand Down Expand Up @@ -1332,11 +1339,8 @@ function numFormat(v, ax, fmtoverride, hover) {
else if(exponentFormat !== 'power') signedExponent = '+' + exponent;
else signedExponent = String(exponent);

if(exponentFormat === 'e') {
v += 'e' + signedExponent;
}
else if(exponentFormat === 'E') {
v += 'E' + signedExponent;
if(exponentFormat === 'e' || exponentFormat === 'E') {
v += exponentFormat + signedExponent;
}
else if(exponentFormat === 'power') {
v += '×10<sup>' + signedExponent + '</sup>';
Expand Down
Loading