};
Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
+ // This masks some numeric issues in older versions of Firefox,
+ // where 1.0/Math.pow(10,2) != Math.pow(10,-2).
+ var pow = function(base, exp) {
+ if (exp < 0) {
+ return 1.0 / Math.pow(base, -exp);
+ }
+ return Math.pow(base, exp);
+ };
+
var pixels_per_tick = opts('pixelsPerLabel');
var ticks = [];
var i, j, tickV, nTicks;
for (i = -10; i < 50; i++) {
var base_scale;
if (kmg2) {
- base_scale = Math.pow(16, i);
+ base_scale = pow(16, i);
} else {
- base_scale = Math.pow(10, i);
+ base_scale = pow(10, i);
}
var spacing = 0;
for (j = 0; j < mults.length; j++) {
// Add formatted labels to the ticks.
var k;
var k_labels = [];
+ var m_labels = [];
if (opts("labelsKMB")) {
k = 1000;
k_labels = [ "K", "M", "B", "T", "Q" ];
if (opts("labelsKMG2")) {
if (k) Dygraph.warn("Setting both labelsKMB and labelsKMG2. Pick one!");
k = 1024;
- k_labels = [ "k", "M", "G", "T", "P", "E" ];
+ k_labels = [ "k", "M", "G", "T", "P", "E", "Z", "Y" ];
+ m_labels = [ "m", "u", "n", "p", "f", "a", "z", "y" ];
}
var formatter = opts('axisLabelFormatter');
if (k_labels.length > 0) {
// TODO(danvk): should this be integrated into the axisLabelFormatter?
// Round up to an appropriate unit.
- var n = Math.pow(k, k_labels.length);
+ var n = pow(k, k_labels.length);
for (j = k_labels.length - 1; j >= 0; j--, n /= k) {
if (absTickV >= n) {
label = Dygraph.round_(tickV / n, opts('digitsAfterDecimal')) +
}
}
}
+ if(opts("labelsKMG2")){
+ tickV = String(tickV.toExponential());
+ if(tickV.split('e-').length === 2 && tickV.split('e-')[1] >= 3 && tickV.split('e-')[1] <= 24){
+ if(tickV.split('e-')[1] % 3 > 0) {
+ label = Dygraph.round_(tickV.split('e-')[0] /
+ pow(10,(tickV.split('e-')[1] % 3)),
+ opts('digitsAfterDecimal'));
+ } else {
+ label = Number(tickV.split('e-')[0]).toFixed(2);
+ }
+ label += m_labels[Math.floor(tickV.split('e-')[1] / 3) - 1];
+ }
+ }
ticks[i].label = label;
}
// Find a time less than start_time which occurs on a "nice" time boundary
// for this granularity.
var g = spacing / 1000;
- var d = new Date(start_time).setMilliseconds(0);
+ var d = new Date(start_time);
+ d.setMilliseconds(0);
var x;
if (g <= 60) { // seconds
x = d.getSeconds(); d.setSeconds(x - x % g);