Millisecond granularity (#893)
[dygraphs.git] / src / dygraph-tickers.js
CommitLineData
88e95c46
DV
1/**
2 * @license
3 * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
4 * MIT-licensed (http://opensource.org/licenses/MIT)
5 */
48e614ac
DV
6
7/**
8 * @fileoverview Description of this file.
9 * @author danvk@google.com (Dan Vanderkam)
10 *
11 * A ticker is a function with the following interface:
12 *
13 * function(a, b, pixels, options_view, dygraph, forced_values);
14 * -> [ { v: tick1_v, label: tick1_label[, label_v: label_v1] },
15 * { v: tick2_v, label: tick2_label[, label_v: label_v2] },
16 * ...
17 * ]
18 *
19 * The returned value is called a "tick list".
20 *
21 * Arguments
22 * ---------
23 *
24 * [a, b] is the range of the axis for which ticks are being generated. For a
25 * numeric axis, these will simply be numbers. For a date axis, these will be
26 * millis since epoch (convertable to Date objects using "new Date(a)" and "new
27 * Date(b)").
28 *
29 * opts provides access to chart- and axis-specific options. It can be used to
30 * access number/date formatting code/options, check for a log scale, etc.
31 *
32 * pixels is the length of the axis in pixels. opts('pixelsPerLabel') is the
33 * minimum amount of space to be allotted to each label. For instance, if
34 * pixels=400 and opts('pixelsPerLabel')=40 then the ticker should return
35 * between zero and ten (400/40) ticks.
36 *
37 * dygraph is the Dygraph object for which an axis is being constructed.
38 *
39 * forced_values is used for secondary y-axes. The tick positions are typically
40 * set by the primary y-axis, so the secondary y-axis has no choice in where to
41 * put these. It simply has to generate labels for these data values.
42 *
43 * Tick lists
44 * ----------
45 * Typically a tick will have both a grid/tick line and a label at one end of
46 * that line (at the bottom for an x-axis, at left or right for the y-axis).
47 *
48 * A tick may be missing one of these two components:
49 * - If "label_v" is specified instead of "v", then there will be no tick or
50 * gridline, just a label.
51 * - Similarly, if "label" is not specified, then there will be a gridline
52 * without a label.
53 *
54 * This flexibility is useful in a few situations:
55 * - For log scales, some of the tick lines may be too close to all have labels.
56 * - For date scales where years are being displayed, it is desirable to display
57 * tick marks at the beginnings of years but labels (e.g. "2006") in the
58 * middle of the years.
59 */
60
3ce712e6 61/*jshint sub:true */
758a629f 62/*global Dygraph:false */
c0f54d4f
DV
63"use strict";
64
6ecc0739
DV
65import * as utils from './dygraph-utils';
66
b2867ee1 67/** @typedef {Array.<{v:number, label:string, label_v:(string|undefined)}>} */
6ecc0739 68var TickList = undefined; // the ' = undefined' keeps jshint happy.
b2867ee1
DV
69
70/** @typedef {function(
71 * number,
72 * number,
73 * number,
74 * function(string):*,
75 * Dygraph=,
76 * Array.<number>=
6ecc0739 77 * ): TickList}
b2867ee1 78 */
6ecc0739 79var Ticker = undefined; // the ' = undefined' keeps jshint happy.
b2867ee1 80
6ecc0739
DV
81/** @type {Ticker} */
82export var numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) {
44462ba3
KW
83 var nonLogscaleOpts = function(opt) {
84 if (opt === 'logscale') return false;
85 return opts(opt);
86 };
6ecc0739 87 return numericTicks(a, b, pixels, nonLogscaleOpts, dygraph, vals);
44462ba3
KW
88};
89
6ecc0739
DV
90/** @type {Ticker} */
91export var numericTicks = function(a, b, pixels, opts, dygraph, vals) {
b2867ee1 92 var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
48e614ac 93 var ticks = [];
758a629f 94 var i, j, tickV, nTicks;
48e614ac 95 if (vals) {
758a629f 96 for (i = 0; i < vals.length; i++) {
48e614ac
DV
97 ticks.push({v: vals[i]});
98 }
99 } else {
100 // TODO(danvk): factor this log-scale block out into a separate function.
101 if (opts("logscale")) {
758a629f 102 nTicks = Math.floor(pixels / pixels_per_tick);
6ecc0739
DV
103 var minIdx = utils.binarySearch(a, PREFERRED_LOG_TICK_VALUES, 1);
104 var maxIdx = utils.binarySearch(b, PREFERRED_LOG_TICK_VALUES, -1);
48e614ac
DV
105 if (minIdx == -1) {
106 minIdx = 0;
107 }
108 if (maxIdx == -1) {
6ecc0739 109 maxIdx = PREFERRED_LOG_TICK_VALUES.length - 1;
48e614ac
DV
110 }
111 // Count the number of tick values would appear, if we can get at least
112 // nTicks / 4 accept them.
113 var lastDisplayed = null;
114 if (maxIdx - minIdx >= nTicks / 4) {
115 for (var idx = maxIdx; idx >= minIdx; idx--) {
6ecc0739 116 var tickValue = PREFERRED_LOG_TICK_VALUES[idx];
48e614ac
DV
117 var pixel_coord = Math.log(tickValue / a) / Math.log(b / a) * pixels;
118 var tick = { v: tickValue };
758a629f 119 if (lastDisplayed === null) {
48e614ac
DV
120 lastDisplayed = {
121 tickValue : tickValue,
122 pixel_coord : pixel_coord
123 };
124 } else {
125 if (Math.abs(pixel_coord - lastDisplayed.pixel_coord) >= pixels_per_tick) {
126 lastDisplayed = {
127 tickValue : tickValue,
128 pixel_coord : pixel_coord
129 };
130 } else {
131 tick.label = "";
132 }
133 }
134 ticks.push(tick);
135 }
136 // Since we went in backwards order.
137 ticks.reverse();
138 }
139 }
140
141 // ticks.length won't be 0 if the log scale function finds values to insert.
758a629f 142 if (ticks.length === 0) {
48e614ac
DV
143 // Basic idea:
144 // Try labels every 1, 2, 5, 10, 20, 50, 100, etc.
145 // Calculate the resulting tick spacing (i.e. this.height_ / nTicks).
146 // The first spacing greater than pixelsPerYLabel is what we use.
147 // TODO(danvk): version that works on a log scale.
148 var kmg2 = opts("labelsKMG2");
fa0d7ad8 149 var mults, base;
48e614ac 150 if (kmg2) {
48f5d762 151 mults = [1, 2, 4, 8, 16, 32, 64, 128, 256];
fa0d7ad8 152 base = 16;
48e614ac 153 } else {
48f5d762 154 mults = [1, 2, 5, 10, 20, 50, 100];
fa0d7ad8 155 base = 10;
48e614ac 156 }
fa0d7ad8 157
48f5d762
KW
158 // Get the maximum number of permitted ticks based on the
159 // graph's pixel size and pixels_per_tick setting.
160 var max_ticks = Math.ceil(pixels / pixels_per_tick);
161
162 // Now calculate the data unit equivalent of this tick spacing.
163 // Use abs() since graphs may have a reversed Y axis.
164 var units_per_tick = Math.abs(b - a) / max_ticks;
165
166 // Based on this, get a starting scale which is the largest
167 // integer power of the chosen base (10 or 16) that still remains
168 // below the requested pixels_per_tick spacing.
fa0d7ad8
KW
169 var base_power = Math.floor(Math.log(units_per_tick) / Math.log(base));
170 var base_scale = Math.pow(base, base_power);
48f5d762
KW
171
172 // Now try multiples of the starting scale until we find one
173 // that results in tick marks spaced sufficiently far apart.
174 // The "mults" array should cover the range 1 .. base^2 to
175 // adjust for rounding and edge effects.
0cd1ad15 176 var scale, low_val, high_val, spacing;
fa0d7ad8
KW
177 for (j = 0; j < mults.length; j++) {
178 scale = base_scale * mults[j];
179 low_val = Math.floor(a / scale) * scale;
180 high_val = Math.ceil(b / scale) * scale;
181 nTicks = Math.abs(high_val - low_val) / scale;
182 spacing = pixels / nTicks;
48e614ac
DV
183 if (spacing > pixels_per_tick) break;
184 }
185
186 // Construct the set of ticks.
187 // Allow reverse y-axis if it's explicitly requested.
188 if (low_val > high_val) scale *= -1;
9146b6c0 189 for (i = 0; i <= nTicks; i++) {
758a629f 190 tickV = low_val + i * scale;
48e614ac
DV
191 ticks.push( {v: tickV} );
192 }
193 }
194 }
195
d67a4279 196 var formatter = /**@type{AxisLabelFormatter}*/(opts('axisLabelFormatter'));
48e614ac
DV
197
198 // Add labels to the ticks.
758a629f 199 for (i = 0; i < ticks.length; i++) {
48e614ac 200 if (ticks[i].label !== undefined) continue; // Use current label.
48e614ac 201 // TODO(danvk): set granularity to something appropriate here.
6addd5b7 202 ticks[i].label = formatter.call(dygraph, ticks[i].v, 0, opts, dygraph);
48e614ac
DV
203 }
204
205 return ticks;
206};
207
208
6ecc0739
DV
209/** @type {Ticker} */
210export var dateTicker = function(a, b, pixels, opts, dygraph, vals) {
211 var chosen = pickDateTickGranularity(a, b, pixels, opts);
48e614ac
DV
212
213 if (chosen >= 0) {
6ecc0739 214 return getDateAxis(a, b, chosen, opts, dygraph);
48e614ac
DV
215 } else {
216 // this can happen if self.width_ is zero.
217 return [];
218 }
219};
220
221// Time granularity enumeration
6ecc0739 222export var Granularity = {
c33b49f9 223 MILLISECONDLY: 0,
224 TWO_MILLISECONDLY: 1,
225 FIVE_MILLISECONDLY: 2,
226 TEN_MILLISECONDLY: 3,
227 FIFTY_MILLISECONDLY: 4,
228 HUNDRED_MILLISECONDLY: 5,
229 FIVE_HUNDRED_MILLISECONDLY: 6,
230 SECONDLY: 7,
231 TWO_SECONDLY: 8,
232 FIVE_SECONDLY: 9,
233 TEN_SECONDLY: 10,
234 THIRTY_SECONDLY: 11,
235 MINUTELY: 12,
236 TWO_MINUTELY: 13,
237 FIVE_MINUTELY: 14,
238 TEN_MINUTELY: 15,
239 THIRTY_MINUTELY: 16,
240 HOURLY: 17,
241 TWO_HOURLY: 18,
242 SIX_HOURLY: 19,
243 DAILY: 20,
244 TWO_DAILY: 21,
245 WEEKLY: 22,
246 MONTHLY: 23,
247 QUARTERLY: 24,
248 BIANNUAL: 25,
249 ANNUAL: 26,
250 DECADAL: 27,
251 CENTENNIAL: 28,
252 NUM_GRANULARITIES: 29
6ecc0739 253}
48e614ac 254
872a6a00
DV
255// Date components enumeration (in the order of the arguments in Date)
256// TODO: make this an @enum
6ecc0739
DV
257var DateField = {
258 DATEFIELD_Y: 0,
259 DATEFIELD_M: 1,
260 DATEFIELD_D: 2,
261 DATEFIELD_HH: 3,
262 DATEFIELD_MM: 4,
263 DATEFIELD_SS: 5,
264 DATEFIELD_MS: 6,
265 NUM_DATEFIELDS: 7
266};
872a6a00
DV
267
268
64b7098e
DV
269/**
270 * The value of datefield will start at an even multiple of "step", i.e.
271 * if datefield=SS and step=5 then the first tick will be on a multiple of 5s.
272 *
273 * For granularities <= HOURLY, ticks are generated every `spacing` ms.
274 *
275 * At coarser granularities, ticks are generated by incrementing `datefield` by
276 * `step`. In this case, the `spacing` value is only used to estimate the
277 * number of ticks. It should roughly correspond to the spacing between
278 * adjacent ticks.
279 *
280 * @type {Array.<{datefield:number, step:number, spacing:number}>}
281 */
6ecc0739 282var TICK_PLACEMENT = [];
c33b49f9 283TICK_PLACEMENT[Granularity.MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 1, spacing: 1};
284TICK_PLACEMENT[Granularity.TWO_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 2, spacing: 2};
285TICK_PLACEMENT[Granularity.FIVE_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 5, spacing: 5};
286TICK_PLACEMENT[Granularity.TEN_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 10, spacing: 10};
287TICK_PLACEMENT[Granularity.FIFTY_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 50, spacing: 50};
288TICK_PLACEMENT[Granularity.HUNDRED_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 100, spacing: 100};
289TICK_PLACEMENT[Granularity.FIVE_HUNDRED_MILLISECONDLY] = {datefield: DateField.DATEFIELD_MS, step: 500, spacing: 500};
6ecc0739
DV
290TICK_PLACEMENT[Granularity.SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 1, spacing: 1000 * 1};
291TICK_PLACEMENT[Granularity.TWO_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 2, spacing: 1000 * 2};
292TICK_PLACEMENT[Granularity.FIVE_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 5, spacing: 1000 * 5};
293TICK_PLACEMENT[Granularity.TEN_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 10, spacing: 1000 * 10};
294TICK_PLACEMENT[Granularity.THIRTY_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 30, spacing: 1000 * 30};
295TICK_PLACEMENT[Granularity.MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 1, spacing: 1000 * 60};
296TICK_PLACEMENT[Granularity.TWO_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 2, spacing: 1000 * 60 * 2};
297TICK_PLACEMENT[Granularity.FIVE_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 5, spacing: 1000 * 60 * 5};
298TICK_PLACEMENT[Granularity.TEN_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 10, spacing: 1000 * 60 * 10};
299TICK_PLACEMENT[Granularity.THIRTY_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 30, spacing: 1000 * 60 * 30};
300TICK_PLACEMENT[Granularity.HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 1, spacing: 1000 * 3600};
301TICK_PLACEMENT[Granularity.TWO_HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 2, spacing: 1000 * 3600 * 2};
302TICK_PLACEMENT[Granularity.SIX_HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 6, spacing: 1000 * 3600 * 6};
303TICK_PLACEMENT[Granularity.DAILY] = {datefield: DateField.DATEFIELD_D, step: 1, spacing: 1000 * 86400};
304TICK_PLACEMENT[Granularity.TWO_DAILY] = {datefield: DateField.DATEFIELD_D, step: 2, spacing: 1000 * 86400 * 2};
305TICK_PLACEMENT[Granularity.WEEKLY] = {datefield: DateField.DATEFIELD_D, step: 7, spacing: 1000 * 604800};
306TICK_PLACEMENT[Granularity.MONTHLY] = {datefield: DateField.DATEFIELD_M, step: 1, spacing: 1000 * 7200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 12
307TICK_PLACEMENT[Granularity.QUARTERLY] = {datefield: DateField.DATEFIELD_M, step: 3, spacing: 1000 * 21600 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 4
308TICK_PLACEMENT[Granularity.BIANNUAL] = {datefield: DateField.DATEFIELD_M, step: 6, spacing: 1000 * 43200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 2
309TICK_PLACEMENT[Granularity.ANNUAL] = {datefield: DateField.DATEFIELD_Y, step: 1, spacing: 1000 * 86400 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 1
310TICK_PLACEMENT[Granularity.DECADAL] = {datefield: DateField.DATEFIELD_Y, step: 10, spacing: 1000 * 864000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 10
311TICK_PLACEMENT[Granularity.CENTENNIAL] = {datefield: DateField.DATEFIELD_Y, step: 100, spacing: 1000 * 8640000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 100
48e614ac 312
3c1b72e1 313
48e614ac 314/**
48e614ac
DV
315 * This is a list of human-friendly values at which to show tick marks on a log
316 * scale. It is k * 10^n, where k=1..9 and n=-39..+39, so:
317 * ..., 1, 2, 3, 4, 5, ..., 9, 10, 20, 30, ..., 90, 100, 200, 300, ...
e8c70e4e 318 * NOTE: this assumes that utils.LOG_SCALE = 10.
b2867ee1 319 * @type {Array.<number>}
48e614ac 320 */
6ecc0739 321var PREFERRED_LOG_TICK_VALUES = (function() {
48e614ac
DV
322 var vals = [];
323 for (var power = -39; power <= 39; power++) {
324 var range = Math.pow(10, power);
325 for (var mult = 1; mult <= 9; mult++) {
326 var val = range * mult;
327 vals.push(val);
328 }
329 }
330 return vals;
3ce712e6 331})();
48e614ac 332
7a1f1877
AV
333/**
334 * Determine the correct granularity of ticks on a date axis.
335 *
b2867ee1
DV
336 * @param {number} a Left edge of the chart (ms)
337 * @param {number} b Right edge of the chart (ms)
338 * @param {number} pixels Size of the chart in the relevant dimension (width).
872a6a00 339 * @param {function(string):*} opts Function mapping from option name -&gt; value.
b2867ee1
DV
340 * @return {number} The appropriate axis granularity for this chart. See the
341 * enumeration of possible values in dygraph-tickers.js.
7a1f1877 342 */
6ecc0739 343var pickDateTickGranularity = function(a, b, pixels, opts) {
b2867ee1 344 var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
6ecc0739
DV
345 for (var i = 0; i < Granularity.NUM_GRANULARITIES; i++) {
346 var num_ticks = numDateTicks(a, b, i);
7a1f1877
AV
347 if (pixels / num_ticks >= pixels_per_tick) {
348 return i;
349 }
350 }
351 return -1;
352};
353
b2867ee1 354/**
872a6a00 355 * Compute the number of ticks on a date axis for a given granularity.
b2867ee1
DV
356 * @param {number} start_time
357 * @param {number} end_time
358 * @param {number} granularity (one of the granularities enumerated above)
872a6a00 359 * @return {number} (Approximate) number of ticks that would result.
b2867ee1 360 */
6ecc0739
DV
361var numDateTicks = function(start_time, end_time, granularity) {
362 var spacing = TICK_PLACEMENT[granularity].spacing;
872a6a00 363 return Math.round(1.0 * (end_time - start_time) / spacing);
48e614ac
DV
364};
365
b2867ee1 366/**
872a6a00 367 * Compute the positions and labels of ticks on a date axis for a given granularity.
b2867ee1
DV
368 * @param {number} start_time
369 * @param {number} end_time
370 * @param {number} granularity (one of the granularities enumerated above)
371 * @param {function(string):*} opts Function mapping from option name -&gt; value.
372 * @param {Dygraph=} dg
6ecc0739 373 * @return {!TickList}
b2867ee1 374 */
6ecc0739 375export var getDateAxis = function(start_time, end_time, granularity, opts, dg) {
d67a4279 376 var formatter = /** @type{AxisLabelFormatter} */(
b2867ee1 377 opts("axisLabelFormatter"));
8c0599e3 378 var utc = opts("labelsUTC");
6ecc0739 379 var accessors = utc ? utils.DateAccessorsUTC : utils.DateAccessorsLocal;
1e7f8af0 380
6ecc0739
DV
381 var datefield = TICK_PLACEMENT[granularity].datefield;
382 var step = TICK_PLACEMENT[granularity].step;
383 var spacing = TICK_PLACEMENT[granularity].spacing;
1e7f8af0 384
872a6a00
DV
385 // Choose a nice tick position before the initial instant.
386 // Currently, this code deals properly with the existent daily granularities:
387 // DAILY (with step of 1) and WEEKLY (with step of 7 but specially handled).
388 // Other daily granularities (say TWO_DAILY) should also be handled specially
389 // by setting the start_date_offset to 0.
390 var start_date = new Date(start_time);
1e7f8af0 391 var date_array = [];
6ecc0739
DV
392 date_array[DateField.DATEFIELD_Y] = accessors.getFullYear(start_date);
393 date_array[DateField.DATEFIELD_M] = accessors.getMonth(start_date);
394 date_array[DateField.DATEFIELD_D] = accessors.getDate(start_date);
395 date_array[DateField.DATEFIELD_HH] = accessors.getHours(start_date);
396 date_array[DateField.DATEFIELD_MM] = accessors.getMinutes(start_date);
397 date_array[DateField.DATEFIELD_SS] = accessors.getSeconds(start_date);
398 date_array[DateField.DATEFIELD_MS] = accessors.getMilliseconds(start_date);
1e7f8af0 399
872a6a00 400 var start_date_offset = date_array[datefield] % step;
6ecc0739 401 if (granularity == Granularity.WEEKLY) {
872a6a00 402 // This will put the ticks on Sundays.
1e7f8af0 403 start_date_offset = accessors.getDay(start_date);
872a6a00 404 }
1e7f8af0 405
872a6a00 406 date_array[datefield] -= start_date_offset;
6ecc0739 407 for (var df = datefield + 1; df < DateField.NUM_DATEFIELDS; df++) {
872a6a00 408 // The minimum value is 1 for the day of month, and 0 for all other fields.
6ecc0739 409 date_array[df] = (df === DateField.DATEFIELD_D) ? 1 : 0;
872a6a00 410 }
48e614ac 411
872a6a00 412 // Generate the ticks.
f921ded5
JPB
413 // For granularities not coarser than HOURLY we use the fact that:
414 // the number of milliseconds between ticks is constant
415 // and equal to the defined spacing.
416 // Otherwise we rely on the 'roll over' property of the Date functions:
417 // when some date field is set to a value outside of its logical range,
418 // the excess 'rolls over' the next (more significant) field.
419 // However, when using local time with DST transitions,
420 // there are dates that do not represent any time value at all
421 // (those in the hour skipped at the 'spring forward'),
422 // and the JavaScript engines usually return an equivalent value.
1e7f8af0
JPB
423 // Hence we have to check that the date is properly increased at each step,
424 // returning a date at a nice tick position.
872a6a00 425 var ticks = [];
1e7f8af0
JPB
426 var tick_date = accessors.makeDate.apply(null, date_array);
427 var tick_time = tick_date.getTime();
6ecc0739 428 if (granularity <= Granularity.HOURLY) {
1e7f8af0
JPB
429 if (tick_time < start_time) {
430 tick_time += spacing;
431 tick_date = new Date(tick_time);
f921ded5 432 }
1e7f8af0
JPB
433 while (tick_time <= end_time) {
434 ticks.push({ v: tick_time,
6addd5b7 435 label: formatter.call(dg, tick_date, granularity, opts, dg)
1e7f8af0
JPB
436 });
437 tick_time += spacing;
438 tick_date = new Date(tick_time);
f921ded5 439 }
1e7f8af0
JPB
440 } else {
441 if (tick_time < start_time) {
f921ded5 442 date_array[datefield] += step;
1e7f8af0
JPB
443 tick_date = accessors.makeDate.apply(null, date_array);
444 tick_time = tick_date.getTime();
f921ded5 445 }
1e7f8af0 446 while (tick_time <= end_time) {
6ecc0739 447 if (granularity >= Granularity.DAILY ||
1e7f8af0
JPB
448 accessors.getHours(tick_date) % step === 0) {
449 ticks.push({ v: tick_time,
6addd5b7 450 label: formatter.call(dg, tick_date, granularity, opts, dg)
f921ded5 451 });
f921ded5
JPB
452 }
453 date_array[datefield] += step;
1e7f8af0
JPB
454 tick_date = accessors.makeDate.apply(null, date_array);
455 tick_time = tick_date.getTime();
48e614ac
DV
456 }
457 }
48e614ac
DV
458 return ticks;
459};