Skip to content

Commit 4d72fa5

Browse files
committed
apply minor.nticks
1 parent 3cb2910 commit 4d72fa5

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

src/plots/cartesian/axes.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -545,24 +545,29 @@ function autoShiftMonthBins(binStart, data, dtick, dataMin, calendar) {
545545
axes.prepMinorTicks = function(ax) {
546546
var majorDtick = ax._majorDtick;
547547
if(ax.tickmode === 'auto' || !ax.dtick) {
548+
var nt = ax.nticks; // minor.nticks
548549
var dist = majorDtick;
549550

550551
if(ax.type === 'date' && typeof majorDtick === 'string' && majorDtick.charAt(0) === 'M') {
551552
var months = Number(majorDtick.substring(1));
552-
dist = months * ONEAVGMONTH / 7;
553+
dist = months * ONEAVGMONTH / (nt || 7);
553554
} else if(ax.type === 'log') {
554-
if(typeof majorDtick === 'string' && majorDtick.charAt(0) === 'L') {
555-
ax.dtick = 'L' + (majorDtick.substring(1) / 2);
556-
return;
557-
} else if(dist === 'D1') {
558-
dist = 1;
559-
} else if(dist === 'D2') {
560-
dist = 'D1';
561-
} else {
562-
dist /= 2;
555+
if(!nt) nt = 2;
556+
557+
if(nt > 1) {
558+
if(typeof majorDtick === 'string' && majorDtick.charAt(0) === 'L') {
559+
ax.dtick = 'L' + (majorDtick.substring(1) / nt);
560+
return;
561+
} else if(dist === 'D1') {
562+
dist = nt - 1;
563+
} else if(dist === 'D2') {
564+
dist = nt === 2 ? 'D1' : nt;
565+
} else {
566+
dist /= nt;
567+
}
563568
}
564569
} else {
565-
dist /= 7;
570+
dist /= nt || 7;
566571
}
567572

568573
axes.autoTicks(ax, dist, 'minor');

0 commit comments

Comments
 (0)