Merge pull request #7337 from NelleV/7211_symlog

efiring · efiring · commit e2de9666175a · 2016-10-29T12:29:39.000-10:00
FIX symlog scale now shows negative labels.
Conflicts:
	lib/matplotlib/tests/test_ticker.py
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -1,7 +1,6 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-import six
 import nose.tools
 from nose.tools import assert_equal, assert_raises
 from numpy.testing import assert_almost_equal
@@ -312,6 +311,7 @@ def get_view_interval(self):
 def test_LogFormatterSciNotation():
     test_cases = {
         10: (
+             (-1, '${-10^{0}}$'),
              (1e-05, '${10^{-5}}$'),
              (1, '${10^{0}}$'),
              (100000, '${10^{5}}$'),
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -869,14 +869,15 @@ def __call__(self, x, pos=None):
         if x == 0.0:
             return '0'
         sign = np.sign(x)
+        x = abs(x)
         # only label the decades
-        fx = math.log(abs(x)) / math.log(b)
+        fx = math.log(x) / math.log(b)
         isDecade = is_close_to_int(fx)
         exponent = np.round(fx) if isDecade else np.floor(fx)
         coeff = np.round(x / b ** exponent)
         if coeff in self.sublabel:
             if not isDecade and self.labelOnlyBase:
-                s = ''
+                return ''
             elif x > 10000:
                 s = '%1.0e' % x
             elif x < 1:
@@ -1003,7 +1004,7 @@ def __call__(self, x, pos=None):
         fx = math.log(abs(x)) / math.log(b)
         is_decade = is_close_to_int(fx)
         exponent = np.round(fx) if is_decade else np.floor(fx)
-        coeff = np.round(x / b ** exponent)
+        coeff = np.round(abs(x) / b ** exponent)
 
         sign_string = '-' if x < 0 else ''
 
