fixed log coord formatting

svn path=/trunk/matplotlib/; revision=721

Author: jdh2358

lib/matplotlib/axes.py

@@ -9,7 +9,7 @@
 from artist import Artist
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, True, False,\
-     allequal, dict_delall
+     allequal, dict_delall, strip_math
 from collections import RegularPolyCollection, PolyCollection
 from colors import colorConverter, normalize, Colormap, LinearSegmentedColormap
 import cm
@@ -496,7 +496,15 @@ def format_xdata(self, x):
         try: return self.fmt_xdata(x)
         except TypeError:
             func = self.xaxis.get_major_formatter()
-            return func(x)
+            # log formatters label only the decades which is not what
+            # we want for coord formatting.  hackish, yes
+            if isinstance(func, LogFormatter) and func.labelOnlyBase:
+                func.labelOnlyBase = False
+                val = strip_math(func(x))
+                func.labelOnlyBase = True
+            else:
+                val = func(x)
+            return val
 
     def format_ydata(self, y):
         """\
@@ -507,7 +515,15 @@ def format_ydata(self, y):
         try: return self.fmt_ydata(y)
         except TypeError:
             func = self.yaxis.get_major_formatter()
-            return func(y)
+            # log formatters label only the decades which is not what
+            # we want for coord formatting.  hackish, yes
+            if isinstance(func, LogFormatter) and func.labelOnlyBase:
+                func.labelOnlyBase = False
+                val = strip_math(func(y))
+                func.labelOnlyBase = True
+            else:
+                val =  func(y)
+            return val
 
     def format_coord(self, x, y):
         'return a format string formatting the x, y coord'

lib/matplotlib/backend_bases.py

@@ -7,7 +7,7 @@
 import sys
 
 from matplotlib import verbose
-from cbook import is_string_like, enumerate, True, False
+from cbook import is_string_like, enumerate, True, False, strip_math
 from colors import colorConverter
 from numerix import array, sqrt, pi, log, asarray, ones, Float
 from patches import Rectangle
@@ -308,11 +308,8 @@ def draw_rectangle(self, gcEdge, gcFace, x, y, width, height):
         pass # derived must override
 
     def strip_math(self, s):
-        remove = (r'\rm', '\cal', '\tt', '\it', '\\', '{', '}')
-        s = s[1:-1]
-        for r in remove:  s = s.replace(r,'')
-        return s
-    
+        return strip_math(s)
+              
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
         """
         Draw string s at x,y (display coords) with font properties

lib/matplotlib/cbook.py

@@ -15,6 +15,13 @@
     False = False
 
 
+def strip_math(s):
+    'remove latex formatting from mathtext'
+    remove = (r'\rm', '\cal', '\tt', '\it', '\\', '{', '}')
+    s = s[1:-1]
+    for r in remove:  s = s.replace(r,'')
+    return s
+
 class Bunch:
    """
    Often we want to just collect a bunch of stuff together, naming each

lib/matplotlib/ticker.py

@@ -234,6 +234,8 @@ def pprint_val(self, x, d):
 class LogFormatter(ScalarFormatter):
     """
     Format values for log axis; 
+
+    if attribute decadeOnly is True, only the decades will be labelled.
     """
     def __init__(self, base=10.0, labelOnlyBase = True):
         """
@@ -243,14 +245,16 @@ def __init__(self, base=10.0, labelOnlyBase = True):
         """
         self.base = base+0.0
         self.labelOnlyBase=labelOnlyBase
-    
+        self.decadeOnly = True
+
     def base(self,base):
         'change the base for labeling - warning: should always match the base used for LogLocator' 
         self.base=base
 
     def label_minor(self,labelOnlyBase):
         'switch on/off minor ticks labeling' 
         self.labelOnlyBase=labelOnlyBase
+
 
     def __call__(self, x, pos=0):
         'Return the format for tick val x at position pos'