archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Move niceNum to helpers.math, cleanup IE fallbacks (#8570)

Browse Source
This commit is contained in:
Jukka Kurkela 2021-03-05 15:10:24 +02:00 committed by GitHub
parent bc8385e6bb
commit e3cdd7323a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/helpers/helpers.math.js
View File

@ -1,5 +1,10 @@
import {isFinite as isFiniteNumber} from './helpers.core';
/**
* @alias Chart.helpers.math
* @namespace
*/
export const PI = Math.PI;
export const TAU = 2 * PI;
export const PITAU = TAU + PI;
@ -9,10 +14,19 @@ export const HALF_PI = PI / 2;
export const QUARTER_PI = PI / 4;
export const TWO_THIRDS_PI = PI * 2 / 3;
export const log10 = Math.log10;
export const sign = Math.sign;
/**
* @alias Chart.helpers.math
* @namespace
* Implementation of the nice number algorithm used in determining where axis labels will go
* @return {number}
*/
export function niceNum(range) {
const niceRange = Math.pow(10, Math.floor(log10(range)));
const fraction = range / niceRange;
const niceFraction = fraction <= 1 ? 1 : fraction <= 2 ? 2 : fraction <= 5 ? 5 : 10;
return niceFraction * niceRange;
}
/**
* Returns an array of factors sorted from 1 to sqrt(value)
@ -37,16 +51,6 @@ export function _factorize(value) {
return result;
}
export const log10 = Math.log10 || function(x) {
const exponent = Math.log(x) * Math.LOG10E; // Math.LOG10E = 1 / Math.LN10.
// Check for whole powers of 10,
// which due to floating point rounding error should be corrected.
const powerOf10 = Math.round(exponent);
const isPowerOf10 = x === Math.pow(10, powerOf10);
return isPowerOf10 ? powerOf10 : exponent;
};
export function isNumber(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
}
@ -75,18 +79,6 @@ export function _setMinAndMaxByKey(array, target, property) {
}
}
export const sign = Math.sign ?
function(x) {
return Math.sign(x);
} :
function(x) {
x = +x; // convert to a number
if (x === 0 || isNaN(x)) {
return x;
}
return x > 0 ? 1 : -1;
};
export function toRadians(degrees) {
return degrees * (PI / 180);
}

24
src/scales/scale.linearbase.js
View File

@ -1,30 +1,8 @@
import {isNullOrUndef} from '../helpers/helpers.core';
import {almostEquals, almostWhole, log10, _decimalPlaces, _setMinAndMaxByKey, sign} from '../helpers/helpers.math';
import {almostEquals, almostWhole, niceNum, _decimalPlaces, _setMinAndMaxByKey, sign} from '../helpers/helpers.math';
import Scale from '../core/core.scale';
import {formatNumber} from '../core/core.intl';
/**
* Implementation of the nice number algorithm used in determining where axis labels will go
* @return {number}
*/
function niceNum(range) {
const exponent = Math.floor(log10(range));
const fraction = range / Math.pow(10, exponent);
let niceFraction;
if (fraction <= 1.0) {
niceFraction = 1;
} else if (fraction <= 2) {
niceFraction = 2;
} else if (fraction <= 5) {
niceFraction = 5;
} else {
niceFraction = 10;
}
return niceFraction * Math.pow(10, exponent);
}
/**
* Generate a set of linear ticks
* @param generationOptions the options used to generate the ticks