Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor tick fix [backport to 1.4.x] #3612

Merged
merged 5 commits into from
Dec 31, 2014
Merged

Minor tick fix [backport to 1.4.x] #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cb2ef1
change ceil/floor to int division
nhmc Sep 27, 2014
9410113
minor tick bug fix
nhmc Sep 27, 2014
2ada7b7
Add test
nhmc Oct 3, 2014
cc15677
fix to comply with pep8
nhmc Oct 8, 2014
c9b14f6
Actually fix pep8 errors this time...
nhmc Oct 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/matplotlib/tests/test_ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ def test_MultipleLocator():
assert_almost_equal(loc.tick_values(-7, 10), test_value)


def test_AutoMinorLocator():
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that this test is creating a figure which is leaking out and getting re-used in the next test (global state strikes again!).

This test either needs an @cleanup decorator or to be re-written to test the locator without creating a figure/axes. I strongly prefer the second.

from pylab import figure
fig = figure()
ax = fig.add_subplot(111)
ax.set_xlim(0, 1.39)
ax.minorticks_on()
test_value = np.array([0.05, 0.1, 0.15, 0.25, 0.3, 0.35, 0.45,
0.5, 0.55, 0.65, 0.7, 0.75, 0.85, 0.9,
0.95, 1, 1.05, 1.1, 1.15, 1.25, 1.3, 1.35])
assert_almost_equal(ax.xaxis.get_ticklocs(minor=True), test_value)


def test_LogLocator():
loc = mticker.LogLocator(numticks=5)

Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,8 +1747,8 @@ def __call__(self):

if len(majorlocs) > 0:
t0 = majorlocs[0]
tmin = np.ceil((vmin - t0) / minorstep) * minorstep
tmax = np.floor((vmax - t0) / minorstep) * minorstep
tmin = ((vmin - t0) // minorstep + 1) * minorstep
tmax = ((vmax - t0) // minorstep + 1) * minorstep
locs = np.arange(tmin, tmax, minorstep) + t0
cond = np.abs((locs - t0) % majorstep) > minorstep / 10.0
locs = locs.compress(cond)
Expand Down