From 85fca6d588b66e04ee0fa8b0bf0401c95b4fa148 Mon Sep 17 00:00:00 2001 From: Adam Vartanian Date: Thu, 22 Dec 2011 16:42:17 -0500 Subject: [PATCH] Extract the granularity-picking code of the date ticker into a new function. --- dygraph-tickers.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dygraph-tickers.js b/dygraph-tickers.js index a17519e..ae0e40f 100644 --- a/dygraph-tickers.js +++ b/dygraph-tickers.js @@ -193,15 +193,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) { Dygraph.dateTicker = function(a, b, pixels, opts, dygraph, vals) { - var pixels_per_tick = opts('pixelsPerLabel'); - var chosen = -1; - for (var i = 0; i < Dygraph.NUM_GRANULARITIES; i++) { - var num_ticks = Dygraph.numDateTicks(a, b, i); - if (pixels / num_ticks >= pixels_per_tick) { - chosen = i; - break; - } - } + var chosen = Dygraph.pickTickGranularity(a, b, pixels, opts); if (chosen >= 0) { return Dygraph.getDateAxis(a, b, chosen, opts, dygraph); @@ -271,6 +263,17 @@ Dygraph.PREFERRED_LOG_TICK_VALUES = function() { return vals; }(); +Dygraph.pickTickGranularity = function(a, b, pixels, opts) { + var pixels_per_tick = 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) { + return i; + } + } + return -1; +}; + Dygraph.numDateTicks = function(start_time, end_time, granularity) { if (granularity < Dygraph.MONTHLY) { // Generate one tick mark for every fixed interval of time. -- 2.7.4