Skip to content

Commit 93b027e

Browse files
committed
also check for M* dticks to avoid small errors with actual delta between two ticks
1 parent 54882e4 commit 93b027e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/plots/cartesian/axes.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -820,19 +820,19 @@ axes.calcTicks = function calcTicks(ax, opts) {
820820
var delta = definedDelta || actualDelta;
821821
var periodLength = 0;
822822

823-
if(delta >= ONEMINYEAR) {
823+
if(delta >= ONEMINYEAR || ax.dtick === 'M12') {
824824
if(actualDelta >= ONEMINYEAR && actualDelta <= ONEMAXYEAR) {
825825
periodLength = actualDelta;
826826
} else {
827827
periodLength = ONEAVGYEAR;
828828
}
829-
} else if(definedDelta === ONEAVGQUARTER && delta >= ONEMINQUARTER) {
829+
} else if((definedDelta === ONEAVGQUARTER && delta >= ONEMINQUARTER) || ax.dtick === 'M3') {
830830
if(actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER) {
831831
periodLength = actualDelta;
832832
} else {
833833
periodLength = ONEAVGQUARTER;
834834
}
835-
} else if(delta >= ONEMINMONTH) {
835+
} else if(delta >= ONEMINMONTH || ax.dtick === 'M1') {
836836
if(actualDelta >= ONEMINMONTH && actualDelta <= ONEMAXMONTH) {
837837
periodLength = actualDelta;
838838
} else {
Loading

test/jasmine/tests/axes_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5704,7 +5704,7 @@ describe('Test axes', function() {
57045704
},
57055705
{
57065706
range: ['2020-12-15', '2022-12-15'],
5707-
positions: ['2020-10-16 05:15', '2021-01-16 05:15', '2021-04-16 05:15', '2021-07-16 05:15', '2021-10-16 05:15', '2022-01-16 05:15', '2022-04-16 05:15', '2022-07-16 05:15', '2022-10-16 05:15'],
5707+
positions: ['2020-11-16', '2021-02-15', '2021-05-16 12:00', '2021-08-16', '2021-11-16', '2022-02-15', '2022-05-16 12:00', '2022-08-16', '2022-11-16', ],
57085708
labels: [' ', 'Jan 2021', 'Apr 2021', 'Jul 2021', 'Oct 2021', 'Jan 2022', 'Apr 2022', 'Jul 2022', 'Oct 2022']
57095709
},
57105710
{
@@ -5825,7 +5825,7 @@ describe('Test axes', function() {
58255825
},
58265826
{
58275827
range: ['2022-12-15', '2020-12-15'],
5828-
positions: ['2023-01-16 05:15', '2022-10-16 05:15', '2022-07-16 05:15', '2022-04-16 05:15', '2022-01-16 05:15', '2021-10-16 05:15', '2021-07-16 05:15', '2021-04-16 05:15', '2021-01-16 05:15'],
5828+
positions: ['2023-02-16', '2022-11-16', '2022-08-15 12:00', '2022-05-16', '2022-02-16', '2021-11-16', '2021-08-15 12:00', '2021-05-16', '2021-02-15', ],
58295829
labels: [' ', 'Oct 2022', 'Jul 2022', 'Apr 2022', 'Jan 2022', 'Oct 2021', 'Jul 2021', 'Apr 2021', 'Jan 2021']
58305830
},
58315831
{

0 commit comments

Comments
 (0)