X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-tickers.js;h=6ad31027f6b8f0d9e92a5c8fa4ec0c9ac0ac906f;hb=45b74fb1d2acd535102445a8a9301d7a6a39192d;hp=b9815fe153b18ce03307a6311156dd06c7feb6e1;hpb=01f2337b625829db4344321a5573db1251f266ae;p=dygraphs.git diff --git a/dygraph-tickers.js b/dygraph-tickers.js index b9815fe..6ad3102 100644 --- a/dygraph-tickers.js +++ b/dygraph-tickers.js @@ -58,10 +58,25 @@ * middle of the years. */ -/*jshint globalstrict: true */ +/*jshint globalstrict:true, sub:true */ /*global Dygraph:false */ "use strict"; +/** @typedef {Array.<{v:number, label:string, label_v:(string|undefined)}>} */ +Dygraph.TickList = undefined; // the ' = undefined' keeps jshint happy. + +/** @typedef {function( + * number, + * number, + * number, + * function(string):*, + * Dygraph=, + * Array.= + * ): Dygraph.TickList} + */ +Dygraph.Ticker = undefined; // the ' = undefined' keeps jshint happy. + +/** @type {Dygraph.Ticker} */ Dygraph.numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) { var nonLogscaleOpts = function(opt) { if (opt === 'logscale') return false; @@ -70,8 +85,19 @@ Dygraph.numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) { return Dygraph.numericTicks(a, b, pixels, nonLogscaleOpts, dygraph, vals); }; +/** @type {Dygraph.Ticker} */ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { - var pixels_per_tick = opts('pixelsPerLabel'); + // This masks some numeric issues in older versions of Firefox, + // where 1.0/Math.pow(10,2) != Math.pow(10,-2). + /** @type {function(number,number):number} */ + var pow = function(base, exp) { + if (exp < 0) { + return 1.0 / Math.pow(base, -exp); + } + return Math.pow(base, exp); + }; + + var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel')); var ticks = []; var i, j, tickV, nTicks; if (vals) { @@ -128,30 +154,40 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { // The first spacing greater than pixelsPerYLabel is what we use. // TODO(danvk): version that works on a log scale. var kmg2 = opts("labelsKMG2"); - var mults; + var mults, base; if (kmg2) { - mults = [1, 2, 4, 8]; + mults = [1, 2, 4, 8, 16, 32, 64, 128, 256]; + base = 16; } else { - mults = [1, 2, 5]; + mults = [1, 2, 5, 10, 20, 50, 100]; + base = 10; } - var scale, low_val, high_val; - for (i = -10; i < 50; i++) { - var base_scale; - if (kmg2) { - base_scale = Math.pow(16, i); - } else { - base_scale = Math.pow(10, i); - } - var spacing = 0; - for (j = 0; j < mults.length; j++) { - scale = base_scale * mults[j]; - low_val = Math.floor(a / scale) * scale; - high_val = Math.ceil(b / scale) * scale; - nTicks = Math.abs(high_val - low_val) / scale; - spacing = pixels / nTicks; - // wish I could break out of both loops at once... - if (spacing > pixels_per_tick) break; - } + + // Get the maximum number of permitted ticks based on the + // graph's pixel size and pixels_per_tick setting. + var max_ticks = Math.ceil(pixels / pixels_per_tick); + + // Now calculate the data unit equivalent of this tick spacing. + // Use abs() since graphs may have a reversed Y axis. + var units_per_tick = Math.abs(b - a) / max_ticks; + + // Based on this, get a starting scale which is the largest + // integer power of the chosen base (10 or 16) that still remains + // below the requested pixels_per_tick spacing. + var base_power = Math.floor(Math.log(units_per_tick) / Math.log(base)); + var base_scale = Math.pow(base, base_power); + + // Now try multiples of the starting scale until we find one + // that results in tick marks spaced sufficiently far apart. + // The "mults" array should cover the range 1 .. base^2 to + // adjust for rounding and edge effects. + var scale, low_val, high_val, spacing; + for (j = 0; j < mults.length; j++) { + scale = base_scale * mults[j]; + low_val = Math.floor(a / scale) * scale; + high_val = Math.ceil(b / scale) * scale; + nTicks = Math.abs(high_val - low_val) / scale; + spacing = pixels / nTicks; if (spacing > pixels_per_tick) break; } @@ -168,6 +204,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { // 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" ]; @@ -175,12 +212,16 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { 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'); + k = k || 1; // If neither option is specified. + + var formatter = /**@type{AxisLabelFormatter}*/(opts('axisLabelFormatter')); // Add labels to the ticks. + var digitsAfterDecimal = /** @type{number} */(opts('digitsAfterDecimal')); for (i = 0; i < ticks.length; i++) { if (ticks[i].label !== undefined) continue; // Use current label. tickV = ticks[i].v; @@ -190,15 +231,27 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { 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')) + - k_labels[j]; + label = Dygraph.round_(tickV / n, digitsAfterDecimal) + k_labels[j]; break; } } } + 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)), + 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; } @@ -206,6 +259,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { }; +/** @type {Dygraph.Ticker} */ Dygraph.dateTicker = function(a, b, pixels, opts, dygraph, vals) { var chosen = Dygraph.pickDateTickGranularity(a, b, pixels, opts); @@ -218,6 +272,7 @@ Dygraph.dateTicker = function(a, b, pixels, opts, dygraph, vals) { }; // Time granularity enumeration +// TODO(danvk): make this an @enum Dygraph.SECONDLY = 0; Dygraph.TWO_SECONDLY = 1; Dygraph.FIVE_SECONDLY = 2; @@ -241,6 +296,7 @@ Dygraph.DECADAL = 19; Dygraph.CENTENNIAL = 20; Dygraph.NUM_GRANULARITIES = 21; +/** @type {Array.} */ Dygraph.SHORT_SPACINGS = []; Dygraph.SHORT_SPACINGS[Dygraph.SECONDLY] = 1000 * 1; Dygraph.SHORT_SPACINGS[Dygraph.TWO_SECONDLY] = 1000 * 2; @@ -259,11 +315,11 @@ Dygraph.SHORT_SPACINGS[Dygraph.DAILY] = 1000 * 86400; Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY] = 1000 * 604800; /** - * @private * This is a list of human-friendly values at which to show tick marks on a log * scale. It is k * 10^n, where k=1..9 and n=-39..+39, so: * ..., 1, 2, 3, 4, 5, ..., 9, 10, 20, 30, ..., 90, 100, 200, 300, ... * NOTE: this assumes that Dygraph.LOG_SCALE = 10. + * @type {Array.} */ Dygraph.PREFERRED_LOG_TICK_VALUES = function() { var vals = []; @@ -280,15 +336,16 @@ Dygraph.PREFERRED_LOG_TICK_VALUES = function() { /** * Determine the correct granularity of ticks on a date axis. * - * @param {Number} a Left edge of the chart (ms) - * @param {Number} b Right edge of the chart (ms) - * @param {Number} pixels Size of the chart in the relevant dimension (width). - * @param {Function} opts Function mapping from option name -> value. - * @return {Number} The appropriate axis granularity for this chart. See the - * enumeration of possible values in dygraph-tickers.js. + * @param {number} a Left edge of the chart (ms) + * @param {number} b Right edge of the chart (ms) + * @param {number} pixels Size of the chart in the relevant dimension (width). + * @param {function(string):*} opts Function mapping from option name -> + * value. + * @return {number} The appropriate axis granularity for this chart. See the + * enumeration of possible values in dygraph-tickers.js. */ Dygraph.pickDateTickGranularity = function(a, b, pixels, opts) { - var pixels_per_tick = opts('pixelsPerLabel'); + var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel')); for (var i = 0; i < Dygraph.NUM_GRANULARITIES; i++) { var num_ticks = Dygraph.numDateTicks(a, b, i); if (pixels / num_ticks >= pixels_per_tick) { @@ -298,6 +355,12 @@ Dygraph.pickDateTickGranularity = function(a, b, pixels, opts) { return -1; }; +/** + * @param {number} start_time + * @param {number} end_time + * @param {number} granularity (one of the granularities enumerated above) + * @return {number} Number of ticks that would result. + */ Dygraph.numDateTicks = function(start_time, end_time, granularity) { if (granularity < Dygraph.MONTHLY) { // Generate one tick mark for every fixed interval of time. @@ -318,8 +381,17 @@ Dygraph.numDateTicks = function(start_time, end_time, granularity) { } }; +/** + * @param {number} start_time + * @param {number} end_time + * @param {number} granularity (one of the granularities enumerated above) + * @param {function(string):*} opts Function mapping from option name -> value. + * @param {Dygraph=} dg + * @return {!Dygraph.TickList} + */ Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) { - var formatter = opts("axisLabelFormatter"); + var formatter = /** @type{AxisLabelFormatter} */( + opts("axisLabelFormatter")); var ticks = []; var t; @@ -408,6 +480,6 @@ Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) { }; // These are set here so that this file can be included after dygraph.js. -Dygraph.DEFAULT_ATTRS.axes.x.ticker = Dygraph.dateTicker; -Dygraph.DEFAULT_ATTRS.axes.y.ticker = Dygraph.numericTicks; -Dygraph.DEFAULT_ATTRS.axes.y2.ticker = Dygraph.numericTicks; +Dygraph.DEFAULT_ATTRS['axes']['x']['ticker'] = Dygraph.dateTicker; +Dygraph.DEFAULT_ATTRS['axes']['y']['ticker'] = Dygraph.numericTicks; +Dygraph.DEFAULT_ATTRS['axes']['y2']['ticker'] = Dygraph.numericTicks;