8000 Major ticks 1 and 10 units apart have minor ticks 0.25 and 2.5 units … · matplotlib/matplotlib@55135d6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 55135d6

Browse files
hershenhershen
committed
Major ticks 1 and 10 units apart have minor ticks 0.25 and 2.5 units apart
1 parent e458e62 commit 55135d6

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

‎lib/matplotlib/tests/test_colorbar.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,9 @@ def test_colorbar_minorticks_on_off():
282282

283283
cbar = fig.colorbar(im, extend='both')
284284
cbar.minorticks_on()
285-
correct_minorticklocs = np.array([-2.2, -1.8, -1.6, -1.4, -1.2, -0.8,
286-
-0.6, -0.4, -0.2, 0.2, 0.4, 0.6,
287-
0.8, 1.2, 1.4, 1.6, 1.8, 2.2, 2.4,
288-
2.6, 2.8, 3.2])
285+
correct_minorticklocs = np.array([-2.25, -1.75, -1.5, -1.25, -0.75,
286+
-0.5, -0.25, 0.25, 0.5, 0.75, 1.25,
287+
1.5, 1.75, 2.25, 2.5, 2.75, 3.25])
289288
# testing after minorticks_on()
290289
np.testing.assert_almost_equal(cbar.ax.yaxis.get_minorticklocs(),
291290
correct_minorticklocs)

‎lib/matplotlib/tests/test_ticker.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ def test_low_number_of_majorticks(
116116

117117
@staticmethod
118118
def get_majorstep_minordivisions():
119-
return [(1, 5),
119+
return [(1, 4),
120120
(2, 4),
121121
(2.5, 5),
122122
(5, 5),
123-
(10, 5)]
123+
(10, 4)]
124124

125125
# This test is meant to verify the parameterization for
126126
# test_number_of_minor_ticks
@@ -170,11 +170,9 @@ def test_number_of_minor_ticks(
170170
[-1.435e-06, -1.430e-06, -1.425e-06, -1.415e-06, -1.410e-06,
171171
-1.405e-06, -1.395e-06, -1.390e-06, -1.385e-06, -1.375e-06,
172172
-1.370e-06, -1.365e-06, -1.355e-06, -1.350e-06, -1.345e-06],
173-
[-1.48e-06, -1.46e-06, -1.44e-06, -1.42e-06, -1.38e-06, -1.36e-06,
174-
-1.34e-06, -1.32e-06, -1.28e-06, -1.26e-06, -1.24e-06, -1.22e-06,
175-
-1.18e-06, -1.16e-06, -1.14e-06, -1.12e-06, -1.08e-06, -1.06e-06,
176-
-1.04e-06, -1.02e-06, -9.80e-07, -9.60e-07, -9.40e-07, -9.20e-07,
177-
-8.80e-07]]
173+
[-1.475e-06, -1.45e-06, -1.425e-06, -1.375e-06, -1.35e-06, -1.325e-06,
174+
-1.275e-06, -1.25e-06, -1.225e-06, -1.175e-06, -1.15e-06, -1.125e-06,
175+
-1.075e-06, -1.05e-06, -1.025e-06, -9.75e-07, -9.5e-07, -9.25e-07]]
178176

179177
additional_data = list(zip(limits, reference))
180178

‎lib/matplotlib/ticker.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,8 +2621,9 @@ def __call__(self):
26212621

26222622
majorstep_no_exponent = 10 ** (np.log10(majorstep) % 1)
26232623

2624-
if int(np.round(majorstep_no_exponent)) in [1, 5, 10] or \
2625-
np.isclose(majorstep_no_exponent, 2.5):
2624+
if np.isclose(majorstep_no_exponent, 2.5) or \
2625+
(not np.isclose(majorstep_no_exponent, [1, 10]).any() and
2626+
int(np.round(majorstep_no_exponent)) in [1, 5, 10]):
26262627
ndivs = 5
26272628
else:
26282629
ndivs = 4

0 commit comments

Comments
 (0)
0