opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Graph: Improved graph tick decimals logic arround significant digits (#18370)

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-08-05 10:40:42 +02:00
committed by GitHub
parent 35954d7b6f
commit 9a1975714d
2 changed files with 656 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/vendor/flot/jquery.flot.js vendored
View File

@ -1715,6 +1715,23 @@ Licensed under the MIT license.
axis.max = max;
}
// grafana change
function getSignificantDigitCount(n) {
//remove decimal and make positive
n = Math.abs(String(n).replace(".", ""));
if (n == 0) {
return 0;
}
// kill the 0s at the end of n
while (n != 0 && n % 10 == 0) {
n /= 10;
}
// get number of digits
return Math.floor(Math.log(n) / Math.LN10) + 1;
}
function setupTickGeneration(axis) {
var opts = axis.options;
@ -1763,9 +1780,10 @@ Licensed under the MIT license.
axis.delta = delta;
axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
axis.tickSize = opts.tickSize || size;
// grafana addition
if (opts.tickDecimals === null || opts.tickDecimals === undefined) {
axis.scaledDecimals = axis.tickDecimals - Math.floor(Math.log(axis.tickSize) / Math.LN10);
axis.scaledDecimals = axis.tickDecimals - Math.ceil((1 / getSignificantDigitCount(axis.tickSize)) * 3);
}
// Time mode was moved to a plug-in in 0.8, and since so many people use it