Skip to content

LogLocator: fix problems with minor ticks. Closes #8111. #8381

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

Merged
NelleV merged 1 commit into from
Mar 30, 2017
Merged

LogLocator: fix problems with minor ticks. Closes #8111. #8381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified lib/matplotlib/tests/baseline_images/test_path/semi_log_with_zero.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 13 additions & 7 deletions lib/matplotlib/ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,8 +1970,6 @@ def tick_values(self, vmin, vmax):
return np.array([]) # no minor or major ticks
else:
subs = np.array([1.0]) # major ticks
elif numdec > 5 and b >= 6:
subs = np.arange(_first, b, 2.0)
else:
subs = np.arange(_first, b)
else:
Expand All @@ -1987,17 +1985,25 @@ def tick_values(self, vmin, vmax):
while numdec // stride + 1 > numticks:
stride += 1

# Does subs include anything other than 1?
have_subs = len(subs) > 1 or (len(subs == 1) and subs[0] != 1.0)

decades = np.arange(math.floor(vmin) - stride,
math.ceil(vmax) + 2 * stride, stride)

if hasattr(self, '_transform'):
ticklocs = self._transform.inverted().transform(decades)
if len(subs) > 1 or (len(subs == 1) and subs[0] != 1.0):
ticklocs = np.ravel(np.outer(subs, ticklocs))
if have_subs:
if stride == 1:
ticklocs = np.ravel(np.outer(subs, ticklocs))
else:
ticklocs = []
else:
if len(subs) > 1 or (len(subs == 1) and subs[0] != 1.0):
if have_subs:
ticklocs = []
for decadeStart in b ** decades:
ticklocs.extend(subs * decadeStart)
if stride == 1:
for decadeStart in b ** decades:
ticklocs.extend(subs * decadeStart)
else:
ticklocs = b ** decades

Expand Down