remove redundancy

zblz · zblz · commit 4bbdf86732d8 · 2015-10-08T11:09:57.000+01:00
LogFormatterSciNotation is now a subclass of LogFormatterMathtext, and the
differences (how labels are formatted for non-decade ticks) have been factored
out in a `_non_decade_format` function.
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -738,8 +738,6 @@ def pprint_val(self, x, d):
             s = s.rstrip('0').rstrip('.')
         return s
 
-SPECIAL_LOG_EXP = set((-1, 0, 1,))
-
 class LogFormatterExponent(LogFormatter):
     """
     Format values for log axis; using ``exponent = log_base(value)``
@@ -777,6 +775,13 @@ class LogFormatterMathtext(LogFormatter):
     Format values for log axis; using ``exponent = log_base(value)``
     """
 
+    def _non_decade_format(self, sign_string, base, fx, usetex):
+        'Return string for non-decade locations'
+        if usetex:
+            return (r'$%s%s^{%.2f}$') % (sign_string, base, fx)
+        else:
+            return ('$\mathdefault{%s%s^{%.2f}}$') % (sign_string, base, fx)
+
     def __call__(self, x, pos=None):
         'Return the format for tick val *x* at position *pos*'
         b = self._base
@@ -803,12 +808,7 @@ def __call__(self, x, pos=None):
         if not is_decade and self.labelOnlyBase:
             return ''
         elif not is_decade:
-            if usetex:
-                return (r'$%s%s^{%.2f}$') % \
-                                            (sign_string, base, fx)
-            else:
-                return ('$\mathdefault{%s%s^{%.2f}}$') % \
-                                            (sign_string, base, fx)
+            return self._non_decade_format(sign_string, base, fx, usetex)
         else:
             if usetex:
                 return (r'$%s%s^{%d}$') % (sign_string,
@@ -819,78 +819,28 @@ def __call__(self, x, pos=None):
                                                          base,
                                                          nearest_long(fx))
 
-class LogFormatterSciNotation(LogFormatter):
+class LogFormatterSciNotation(LogFormatterMathtext):
     """
     Format values following scientific notation in a logarithmic axis
-
-    Can be used for both minor and major ticks, will follow the same logic as
-    LogLocator with autosub to show minor labels as needed
     """
 
-    def __call__(self, x, pos=None):
-        'Return the format for tick val *x* at position *pos*'
-        b = self._base
-        usetex = rcParams['text.usetex']
-
-        if x == 0:
-            if usetex:
-                return '$0$'
-            else:
-                return '$\mathdefault{0}$'
-
-        fx = math.log(abs(x)) / math.log(b)
-        is_decade = is_close_to_int(fx)
-        if is_decade:
-            exponent = nearest_long(fx)
-            coeff = 1
-        else:
-            exponent = math.floor(fx)
-            coeff = x / b ** exponent
-
-        sign_string = '-' if x < 0 else ''
-
-        # Do not show the base if x is between 0.1 and 10
-        if exponent in SPECIAL_LOG_EXP:
-            if is_close_to_int(x):
-                if usetex:
-                    return '$%d$' % x
-                else:
-                    return r'$\mathdefault{%d}$' % x
-            else:
-                if usetex:
-                    return '$%s$' % x
-                else:
-                    return r'$\mathdefault{%s}$' % x
+    def __init__(self, base=10.0, labelOnlyBase=False):
+        super(LogFormatterSciNotation, self).__init__(base=base,
+                labelOnlyBase=labelOnlyBase)
 
-        # use string formatting of the base if it is not an integer
-        if is_close_to_int(b):
-            base = '%d' % b
-        else:
-            base = '%s' % b
-
-        # use string formatting of the coefficient if it is not an integer
+    def _non_decade_format(self, sign_string, base, fx, usetex):
+        'Return string for non-decade locations'
+        b = float(base)
+        exponent = math.floor(fx)
+        coeff = b ** fx / b ** exponent
         if is_close_to_int(coeff):
-            coeff = '%d' % coeff
-        else:
-            coeff = '%s' % coeff
-
-        if is_decade:
-            if usetex:
-                return (r'$%s%s^{%d}$') % (sign_string,
-                                           base,
-                                           nearest_long(fx))
-            else:
-                return (r'$\mathdefault{%s%s^{%d}}$') % (sign_string,
-                                                         base,
-                                                         nearest_long(fx))
+            coeff = nearest_long(coeff)
+        if usetex:
+            return (r'$%g\times%s^{%d}$') % \
+                                        (coeff, base, exponent)
         else:
-            if usetex:
-                return (r'$%s\times%s^{%d}$') % \
-                                            (coeff, base, exponent)
-            else:
-                return (r'$\mathdefault{%s\times%s^{%d}}$') % \
-                                            (coeff, base, exponent)
-
+            return (r'$\mathdefault{%g\times%s^{%d}}$') % \
+                                        (coeff, base, exponent)
 
 class LogitFormatter(Formatter):
     '''Probability formatter (using Math text)'''
