From fe57c8728e51bfff7182e6e9d001654e23fc323f Mon Sep 17 00:00:00 2001 From: Morley Zhi Date: Thu, 7 Jan 2016 12:41:42 -0500 Subject: [PATCH] Re-enable this; turns out I was mislead by the label spacing --- src/core/core.scale.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/core/core.scale.js b/src/core/core.scale.js index acee9222b..d9fa3f92f 100644 --- a/src/core/core.scale.js +++ b/src/core/core.scale.js @@ -432,6 +432,14 @@ var scaleLabelY; var useAutoskipper = this.options.ticks.autoSkip; + + // figure out the maximum number of gridlines to show + var maxTicks; + + if (this.options.ticks.maxTicksLimit) { + maxTicks = this.options.ticks.maxTicksLimit; + } + // Make sure we draw text in the correct color and font this.ctx.fillStyle = this.options.ticks.fontColor; var labelFont = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily); @@ -454,10 +462,23 @@ if (!useAutoskipper) { skipRatio = false; } + + // if they defined a max number of ticks, + // increase skipRatio until that number is met + if (maxTicks) { + while (!skipRatio || this.ticks.length / (skipRatio || 1) > maxTicks) { + if (!skipRatio) { + skipRatio = 1; + } + skipRatio += 1; + } + } helpers.each(this.ticks, function(label, index) { // Blank ticks - if ((skipRatio > 1 && index % skipRatio > 0) || (label === undefined || label === null)) { + var isLastTick = this.ticks.length == index + 1; + var shouldSkip = skipRatio > 1 && index % skipRatio > 0; + if (shouldSkip && !isLastTick || (label === undefined || label === null)) { return; } var xLineValue = this.getPixelForTick(index); // xvalues for grid lines -- 2.47.2