david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Abbreviated short scale (#268)

Browse Source
This commit is contained in:
Daniel van Noord
2020-12-18 20:47:03 +01:00
parent 7d7516bb21
commit c530bd1a4a
3 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Disp.js
View File

@@ -182,7 +182,7 @@ CM.Disp.Beautify = function(num, floats, forced) {
// TODO: Add changing separators of thousands and making this cut-off user configurable
answer = Math.round(num * 100) / 100;
}
else if (CM.Options.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8
else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Scientific notation, 123456789 => 1.235E+8
answer = num.toExponential(decimals).toString().replace("e", "E");
}
else {
@@ -195,16 +195,23 @@ CM.Disp.Beautify = function(num, floats, forced) {
answer += ' ' + CM.Data.metric[AmountOfTenPowerThree - 1]
}
// If number is too large or little, revert to scientific notation
else answer = CM.Disp.Beautify(num, 0, 3);
else answer = CM.Disp.Beautify(num, 0, 4);
}
else if (CM.Options.Scale == 2 && !forced || forced == 2) { // Short scale, 123456789 => 123.457 M
if (num >= 0.01 && num < Number("1e" + CM.Data.shortScale.length * 3)) {
answer += ' ' + CM.Data.shortScale[AmountOfTenPowerThree - 1];
}
// If number is too large or little, revert to scientific notation
else answer = CM.Disp.Beautify(num, 0, 3);
else answer = CM.Disp.Beautify(num, 0, 4);
}
else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Engineering notation, 123456789 => 123.457E+6
else if (CM.Options.Scale == 3 && !forced || forced == 3) { // Short scale, 123456789 => 123.457 M
if (num >= 0.01 && num < Number("1e" + CM.Data.shortScaleAbbreviated.length * 3)) {
answer += ' ' + CM.Data.shortScaleAbbreviated[AmountOfTenPowerThree - 1];
}
// If number is too large or little, revert to scientific notation
else answer = CM.Disp.Beautify(num, 0, 4);
}
else if (CM.Options.Scale == 5 && !forced || forced == 5) { // Engineering notation, 123456789 => 123.457E+6
answer += 'E' + AmountOfTenPowerThree * 3;
}
}