Skip to content

ENH ticks sublabel display is now an option #7438

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
merged 15 commits into from
Dec 1, 2016
Merged

ENH ticks sublabel display is now an option #7438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9b98582
ENH ticks sublabel display is now an option
NelleV Nov 10, 2016
e6512b2
FIX updated ticker tests
NelleV Nov 10, 2016
1610ce5
FIX LogFormatterSciNotation now works fine with negative non decade v…
NelleV Nov 10, 2016
8f53696
FIX: remove non-breaking space
tacaswell Nov 11, 2016
80dc75a
MAINT renamed sublabel_filtering to label_pruning
NelleV Nov 11, 2016
46e237a
FIX misalignment
NelleV Nov 14, 2016
f718a3b
Improve the minor tick labeling by LogFormatter.
efiring Nov 15, 2016
0f2dfa8
FIX variable isDecade -> is_decode
NelleV Nov 16, 2016
5608c95
MAINT renamed isDecade and is_decade in is_x_decade
NelleV Nov 16, 2016
1fe5820
Improved LogNorm ticks and tick labels on colorbar
efiring Nov 22, 2016
26d5be6
Improve automatic ticks and labels for colorbar with SymLogNorm
efiring Nov 23, 2016
5824343
FIX numpydoc now renders LogFormatterSciNotation properly
NelleV Nov 23, 2016
ee0e513
fix remaining bugs that broke the tests
efiring Nov 23, 2016
37fcaf2
DOC avoid references to decades in ticker module
NelleV Nov 23, 2016
ecc6212
Fix docstring; validate subs
efiring Nov 25, 2016
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
14 changes: 12 additions & 2 deletions lib/matplotlib/colorbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,10 @@ def __init__(self, ax, cmap=None,
self.locator = ticks # Handle default in _ticker()
if format is None:
if isinstance(self.norm, colors.LogNorm):
self.formatter = ticker.LogFormatterMathtext()
self.formatter = ticker.LogFormatterSciNotation()
elif isinstance(self.norm, colors.SymLogNorm):
self.formatter = ticker.LogFormatterSciNotation(
linthresh=self.norm.linthresh)
else:
self.formatter = ticker.ScalarFormatter()
elif cbook.is_string_like(format):
Expand Down Expand Up @@ -574,7 +577,14 @@ def _ticker(self):
b = self.norm.boundaries
locator = ticker.FixedLocator(b, nbins=10)
elif isinstance(self.norm, colors.LogNorm):
locator = ticker.LogLocator()
locator = ticker.LogLocator(subs='all')
elif isinstance(self.norm, colors.SymLogNorm):
# The subs setting here should be replaced
# by logic in the locator.
locator = ticker.SymmetricalLogLocator(
subs=np.arange(1, 10),
linthresh=self.norm.linthresh,
base=10)
else:
if mpl.rcParams['_internal.classic_mode']:
locator = ticker.MaxNLocator()
Expand Down
4 changes: 3 additions & 1 deletion lib/matplotlib/scale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@ def set_default_locators_and_formatters(self, axis):
axis.set_major_locator(LogLocator(self.base))
axis.set_major_formatter(LogFormatterSciNotation(self.base))
axis.set_minor_locator(LogLocator(self.base, self.subs))
axis.set_minor_formatter(LogFormatterSciNotation(self.base, self.subs))
axis.set_minor_formatter(
LogFormatterSciNotation(self.base,
labelOnlyBase=self.subs))

def get_transform(self):
"""
Expand Down
5 changes: 5 additions & 0 deletions lib/matplotlib/tests/test_scale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,8 @@ def test_log_scatter():

buf = io.BytesIO()
fig.savefig(buf, format='svg')


if __name__ == '__main__':
import nose
nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
13 changes: 8 additions & 5 deletions lib/matplotlib/tests/test_ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ def test_SymmetricalLogLocator_set_params():
See if change was successful.
Should not exception.
"""
# since we only test for the params change. I will pass empty transform
sym = mticker.SymmetricalLogLocator(None)
sym = mticker.SymmetricalLogLocator(base=10, linthresh=1)
sym.set_params(subs=[2.0], numticks=8)
nose.tools.assert_equal(sym._subs, [2.0])
nose.tools.assert_equal(sym.numticks, 8)
Expand Down Expand Up @@ -240,7 +239,7 @@ def test_LogFormatter_sublabel():
ax.xaxis.set_major_locator(mticker.LogLocator(base=10, subs=[]))
ax.xaxis.set_minor_locator(mticker.LogLocator(base=10,
subs=np.arange(2, 10)))
ax.xaxis.set_major_formatter(mticker.LogFormatter())
ax.xaxis.set_major_formatter(mticker.LogFormatter(labelOnlyBase=True))
ax.xaxis.set_minor_formatter(mticker.LogFormatter(labelOnlyBase=False))
# axis range above 3 decades, only bases are labeled
ax.set_xlim(1, 1e4)
Expand All @@ -261,9 +260,13 @@ def test_LogFormatter_sublabel():
ax.set_xlim(1, 80)
_sub_labels(ax.xaxis, subs=[])

# axis range at 0 to 1 decades, label subs 2, 3, 6
# axis range at 0.4 to 1 decades, label subs 2, 3, 4, 6
ax.set_xlim(1, 8)
_sub_labels(ax.xaxis, subs=[2, 3, 6])
_sub_labels(ax.xaxis, subs=[2, 3, 4, 6])

# axis range at 0 to 0.4 decades, label all
ax.set_xlim(0.5, 0.9)
_sub_labels(ax.xaxis, subs=np.arange(2, 10, dtype=int))


def _logfe_helper(formatter, base, locs, i, expected_result):
Expand Down
Loading