Skip to content

Commit

Permalink
Fix ticks generation for vertical time scale (#6258)
Browse files Browse the repository at this point in the history
  • Loading branch information
kurkle authored and simonbrunel committed May 12, 2019
1 parent 707e52a commit 89f2e04
Showing 1 changed file with 21 additions and 9 deletions.
30 changes: 21 additions & 9 deletions src/scales/scale.time.js
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,9 @@ module.exports = Scale.extend({
},

/**
* Crude approximation of what the label width might be
* @private
*/
getLabelWidth: function(label) {
_getLabelSize: function(label) {
var me = this;
var ticksOpts = me.options.ticks;
var tickLabelWidth = me.ctx.measureText(label).width;
Expand All @@ -765,7 +764,18 @@ module.exports = Scale.extend({
var sinRotation = Math.sin(angle);
var tickFontSize = valueOrDefault(ticksOpts.fontSize, defaults.global.defaultFontSize);

return (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation);
return {
w: (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation),
h: (tickLabelWidth * sinRotation) + (tickFontSize * cosRotation)
};
},

/**
* Crude approximation of what the label width might be
* @private
*/
getLabelWidth: function(label) {
return this._getLabelSize(label).w;
},

/**
Expand All @@ -779,17 +789,19 @@ module.exports = Scale.extend({

// pick the longest format (milliseconds) for guestimation
var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;

var exampleLabel = me.tickFormatFunction(exampleTime, 0, [], format);
var tickLabelWidth = me.getLabelWidth(exampleLabel);
var size = me._getLabelSize(exampleLabel);

// Using margins instead of padding because padding is not calculated
// at this point (buildTicks). Margins are provided from previous calculation
// in layout steps 5/6
var innerWidth = me.isHorizontal()
? me.width - (margins.left + margins.right)
: me.height - (margins.top + margins.bottom);
var capacity = Math.floor(innerWidth / tickLabelWidth);
var capacity = Math.floor(me.isHorizontal()
? (me.width - margins.left - margins.right) / size.w
: (me.height - margins.top - margins.bottom) / size.h);

if (me.options.offset) {
capacity--;
}

return capacity > 0 ? capacity : 1;
}
Expand Down

0 comments on commit 89f2e04

Please sign in to comment.