ScalarFormatter renders scientific notation and large numerical offsets in

ddale · ddale · commit 039af432e49f · 2005-06-01T15:44:38.000Z
a label at the end of the axis by default. The old formatter is masked as
_ScalarFormatter, in case someone wants the old behavior. -DSD

svn path=/trunk/matplotlib/; revision=1394
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-06-01 The default behavior of ScalarFormatter now renders scientific 
+           notation and large numerical offsets in a label at the end of 
+           the axis. - DSD
+
 2005-06-01 Added Nicholas' frombyte image patch - JDH
 
 2005-05-31 Added vertical TeX support for agg - JDH
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -110,7 +110,7 @@
 from __future__ import division
 import sys, os, re, time, math, warnings
 from mlab import linspace
-from matplotlib import verbose
+from matplotlib import verbose, rcParams
 from numerix import absolute, arange, array, asarray, Float, floor, log, \
      logical_and, nonzero, ones, take, zeros
 from matplotlib.numerix.mlab import amin, amax, std, mean
@@ -199,9 +199,9 @@ def __init__(self, fmt):
     def __call__(self, x, pos=0):
         'Return the format for tick val x at position pos'
         return self.fmt % x
-        
-        
-class ScalarFormatter(Formatter):
+
+
+class _ScalarFormatter(Formatter):
     """
     Tick location is a plain old number.  If viewInterval is set, the
     formatter will use %d, %1.#f or %1.ef as appropriate.  If it is
@@ -239,7 +239,7 @@ def pprint_val(self, x, d):
         return s
 
 
-class NewScalarFormatter(Formatter):
+class ScalarFormatter(Formatter):
     """
     Tick location is a plain old number.  If useOffset==True and the data range
     is much smaller than the data average, then an offset will be determined 
@@ -253,7 +253,7 @@ def __init__(self, useOffset=True, useMathText=False):
         # for example: [1+1e-9,1+2e-9,1+3e-9]
         # useMathText will render the offset an scientific notation in mathtext
         self._useOffset = useOffset
-        self._useMathText = useMathText
+        self._useMathText = useMathText or rcParams['text.usetex']
         self.offset = 0
         self.orderOfMagnitude = 0
         self.format = ''
