some log optimizations

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

Author: jdh2358

API_CHANGES

@@ -15,7 +15,13 @@ API CHANGES in matplotlib-0.72
     old: contour(Z, x=Y, y=Y)
     new: contour(X, Y, Z)
 
- see http://matplotlib.sf.net/matplotlib.pylab.html#-contour
+   see http://matplotlib.sf.net/matplotlib.pylab.html#-contour
+
+
+   Increased the default resolution for save command.
+
+   Renamed the base attribute of the ticker classes to _base to avoid conflict
+   with the base method.  Sitt for subs
 
 API CHANGES in matplotlib-0.71   
 

CHANGELOG

@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-02-05 Some superscript text optimizations for ticking log plots
+
 2005-02-05 Added some default key press events to pylab figures: 'g'
            toggles grid - JDH
 

TODO

@@ -681,3 +681,5 @@ buttons as well for simple things? Circle/ellipse, box, arrows, etc.
     plot(x,y)
     #set(gca(), xscale='log')
     show()
+
+--pyparsing a performance bottleneck for log ticks

examples/backend_driver.py

@@ -104,9 +104,9 @@ def drive(backend, python='python2.3'):
 
 times = {}
 #backends = ['Agg', 'Cairo', 'GDK', 'PS', 'SVG', 'Template']
-backends = ['Agg', 'PS', 'SVG', 'Template']
+#backends = ['Agg', 'PS', 'SVG', 'Template']
 #backends = [ 'GTK', 'WX', 'TkAgg']
-#backends = ['Agg']
+backends = ['Agg']
 python = 'python2.3'
 for backend in backends:
     print 'testing %s' % backend

lib/matplotlib/axes.py

@@ -1820,11 +1820,13 @@ def loglog(self, *args, **kwargs):
 
   * basex: base of the x logarithm
 
-  * subsx: the location of the minor ticks; None defaults to range(2,basex)
+  * subsx: the location of the minor ticks; None defaults to autosubs,
+    which depend on the number of decades in the plot
 
   * basey: base of the y logarithm
 
-  * subsy: the location of the minor yticks; None defaults to range(2,basey)    
+  * subsy: the location of the minor yticks; None defaults to autosubs,
+    which depend on the number of decades in the plot
         """
         if not self._hold: self.cla()
 
@@ -2674,8 +2676,8 @@ def semilogx(self, *args, **kwargs):
 
     * basex: base of the logarithm
 
-    * subsx: the location of the minor ticks; None defaults to
-      range(2,basex)
+    * subsx: the location of the minor ticks; None defaults to autosubs,
+    which depend on the number of decades in the plot
 
         """
 
@@ -2702,8 +2704,8 @@ def semilogy(self, *args, **kwargs):
 
     * basey: base of the logarithm
 
-    * subsy: the location of the minor ticks; None defaults to
-      range(2,basey)
+    * subsy: the location of the minor ticks; None defaults to autosubs,
+    which depend on the number of decades in the plot
 
         """
         d = {'basey': kwargs.get('basey', 10),
@@ -2796,12 +2798,13 @@ def set_xscale(self, value, basex = 10, subsx=None):
 
     * basex: base of the logarithm
 
-    * subsx: the location of the minor ticks; None defaults to range(2,basex)
+    * subsx: the location of the minor ticks; None defaults to autosubs,
+    which depend on the number of decades in the plot
 
 ACCEPTS: str
         """
 
-        if subsx is None: subsx = range(2, basex)
+        #if subsx is None: subsx = range(2, basex)
         assert(value.lower() in ('log', 'linear', ))
         if value == 'log':
             self.xaxis.set_major_locator(LogLocator(basex))
@@ -2877,12 +2880,12 @@ def set_yscale(self, value, basey=10, subsy=None):
     * basey: base of the logarithm
 
     * subsy: the location of the minor ticks; None are the default
-      range(2,basex)
+      is to autosub
 
 ACCEPTS: str      
         """
 
-        if subsy is None: subsy = range(2, basey)
+        #if subsy is None: subsy = range(2, basey)
         assert(value.lower() in ('log', 'linear', ))
 
         if value == 'log':

lib/matplotlib/backends/backend_ps.py

@@ -277,18 +277,16 @@ def draw_line(self, gc, x0, y0, x1, y1):
         """
         Draw a single line from x0,y0 to x1,y1
         """
-        ps = '%s m\n' % _nums_to_str(x0,y0)
-        ps += '%s l' % _nums_to_str(x1,y1)
+        ps = '%1.3f %1.3f m %1.3f %1.3f l'%(x0, y0, x1, y1)
         self._draw_ps(ps, gc, None, "line")
 
     def _draw_lines(self, gc, points):
         """
         Draw many lines.  'points' is a list of point coordinates.
         """
-        ps=[]
-        ps.append("%s m"%_nums_to_str(*points[0]))
-        for x,y in points[1:]:
-            ps.append("%s l"%_nums_to_str(x,y))
+        # inline this for performance
+        ps = ["%1.3f %1.3f m" % points[0]] 
+        ps.extend(["%1.3f %1.3f l"%point for point in points[1:] ])
         self._draw_ps("\n".join(ps), gc, None)
 
     def draw_lines(self, gc, x, y):

lib/matplotlib/mathtext.py

@@ -1142,7 +1142,7 @@ def math_parse_s_ps(s, dpi, fontsize):
 
 math_parse_s_ps.cache = {}
 
-if __name__=='___main__':
+if 0: #__name__=='___main__':
 
     stests = [ 
             r'$dz/dt \/ = \/ \gamma x^2 \/ + \/ \rm{sin}(2\pi y+\phi)$',
@@ -1174,15 +1174,19 @@ def math_parse_s_ps(s, dpi, fontsize):
 
 
 if __name__=='__main__':
-    s = 'i'
-
     Element.fonts = DummyFonts()
-    handler.clear()
-    expression.parseString( s )
-
-    handler.expr.set_size_info(12, 72)
-
-    # set the origin once to allow w, h compution
-    handler.expr.set_origin(0, 0)
-    for e in handler.symbols:
-        assert(hasattr(e, 'metrics'))
+    for i in range(5,20):
+        s = '$10^{%02d}$'%i
+        print 'parsing', s
+        w, h, fonts = math_parse_s_ft2font(s, dpi=27, fontsize=12, angle=0)
+    if 0:
+        Element.fonts = DummyFonts()
+        handler.clear()
+        expression.parseString( s )
+
+        handler.expr.set_size_info(12, 72)
+
+        # set the origin once to allow w, h compution
+        handler.expr.set_origin(0, 0)
+        for e in handler.symbols:
+            assert(hasattr(e, 'metrics'))

lib/matplotlib/pylab.py

@@ -999,7 +999,7 @@ def rcdefaults():
     draw_if_interactive()
 rcdefaults.__doc__ =   matplotlib.rcdefaults.__doc__
 
-def save(fname, X, fmt='%1.4f'):
+def save(fname, X, fmt='%.18e'):
     """
     Save the data in X to file fname using fmt string to convert the
     data to strings

lib/matplotlib/text.py

@@ -2,6 +2,7 @@
 Figure and Axes text
 """
 from __future__ import division
+import re
 from matplotlib import verbose
 import matplotlib
 import math
@@ -10,9 +11,11 @@
 from font_manager import FontProperties
 from matplotlib import rcParams
 from patches import bbox_artist
-from numerix import sin, cos, pi, Matrix, cumsum
+from numerix import sin, cos, pi, cumsum, dot, array
 from transforms import lbwh_to_bbox, bbox_all
 
+
+
 def _process_text_args(override, fontdict=None, **kwargs):
     "Return an override dict.  See 'text' docstring for info"
 
@@ -30,6 +33,8 @@ class Text(Artist):
     Handle storing and drawing of text in window or data coordinates
 
     """
+    # special case superscripting to speedup logplots
+    _rgxsuper = re.compile('\$([0-9]+)\^\{(-?[0-9]+)\}\$')
 
     zorder = 3
     def __init__(self, 
@@ -60,6 +65,7 @@ def __init__(self,
         self._fontproperties = fontproperties
         self._bbox = None
         self._renderer = None        
+        
     def _get_multialignment(self):
         if self._multialignment is not None: return self._multialignment
         else: return self._horizontalalignment
@@ -145,7 +151,8 @@ def _get_layout(self, renderer):
             offsetLayout = [ (thisx, thisy) for line, thisx, thisy, w, h in horizLayout]
 
         # now rotate the bbox
-        cornersRotated = [M*Matrix([[thisx],[thisy],[1]]) for thisx, thisy in cornersHoriz]
+        
+        cornersRotated = [dot(M,array([[thisx],[thisy],[1]])) for thisx, thisy in cornersHoriz]
 
         txs = [float(v[0][0]) for v in cornersRotated]
         tys = [float(v[1][0]) for v in cornersRotated]
@@ -181,7 +188,7 @@ def _get_layout(self, renderer):
 
 
         # now rotate the positions around the first x,y position
-        xys = [M*Matrix([[thisx],[thisy],[1]]) for thisx, thisy in offsetLayout]
+        xys = [dot(M,array([[thisx],[thisy],[1]])) for thisx, thisy in offsetLayout]
 
 
         tx = [float(v[0][0])+offsetx for v in xys]
@@ -223,6 +230,23 @@ def draw(self, renderer):
         if self._bbox:
             bbox_artist(self, renderer, self._bbox)
         angle = self.get_rotation()
+
+        if angle==0:
+            m = self._rgxsuper.match(self._text)
+            if m is not None:
+                bbox, info = self._get_layout_super(self._renderer, m)
+                base, xt, yt = info[0]
+                renderer.draw_text(gc, xt, yt, base,
+                                   self._fontproperties, angle,
+                                   ismath=False)
+
+                exponent, xt, yt, fp = info[1]
+                renderer.draw_text(gc, xt, yt, exponent,
+                                   fp, angle,
+                                   ismath=False)
+                return
+
+                    
         bbox, info = self._get_layout(renderer)
 
         for line, wh, x, y in info:
@@ -318,10 +342,21 @@ def get_verticalalignment(self):
         return self._verticalalignment
 
     def get_window_extent(self, renderer=None):
+        if self._text == '':
+            tx, ty = self._transform.xy_tup( (self._x, self._y) )
+            return lbwh_to_bbox(tx,ty,0,0)
+        
         if renderer is not None:
             self._renderer = renderer
         if self._renderer is None:
             raise RuntimeError('Cannot get window extent w/o renderer')
+
+        angle = self.get_rotation()
+        if angle==0:
+            m = self._rgxsuper.match(self._text)
+            if m is not None:
+                bbox, tmp = self._get_layout_super(self._renderer, m)
+                return bbox
         bbox, info = self._get_layout(self._renderer)
         return bbox
 
@@ -331,22 +366,22 @@ def get_rotation_matrix(self, x0, y0):
 
         theta = pi/180.0*self.get_rotation()
         # translate x0,y0 to origin
-        Torigin = Matrix([ [1, 0, -x0],
+        Torigin = array([ [1, 0, -x0],
                            [0, 1, -y0],
                            [0, 0, 1  ]]) 
 
         # rotate by theta
-        R = Matrix([ [cos(theta),  -sin(theta), 0],
+        R = array([ [cos(theta),  -sin(theta), 0],
                      [sin(theta), cos(theta), 0],
                      [0,           0,          1]]) 
 
         # translate origin back to x0,y0
-        Tback = Matrix([ [1, 0, x0],
+        Tback = array([ [1, 0, x0],
                          [0, 1, y0],
                          [0, 0, 1  ]]) 
 
 
-        return Tback*R*Torigin
+        return dot(dot(Tback,R), Torigin)
 
     def set_backgroundcolor(self, color):
         """
@@ -545,3 +580,53 @@ def set_fontproperties(self, fp):
 
 
 
+    
+    def _get_layout_super(self, renderer, m):
+        """
+        a special case optimization if a log super and angle = 0
+        Basically, mathtext is slow and we can do simple superscript layout "by hand"
+        """
+        
+        key = self.get_prop_tup()
+        if self.cached.has_key(key): return self.cached[key]
+
+        base, exponent = m.group(1), m.group(2)
+        size =  self._fontproperties.get_size_in_points()
+        fpexp = self._fontproperties.copy()
+        fpexp.set_size(0.7*size)
+        wb,hb = renderer.get_text_width_height(base, self._fontproperties, False)
+        we,he = renderer.get_text_width_height(exponent, fpexp, False)
+
+        w = wb+we
+
+        xb, yb = self._transform.xy_tup((self._x, self._y))
+        xe = xb+wb
+        ye = yb+0.5*hb
+        h = ye+he-yb
+
+
+
+
+        if self._horizontalalignment=='center':  xo = -w/2.
+        elif self._horizontalalignment=='right':  xo = -w
+        else: xo = 0
+        if self._verticalalignment=='center':    yo = -hb/2.
+        elif self._verticalalignment=='top':  yo = -hb
+        else: yo = 0
+
+        xb += xo
+        yb += yo
+        xe += xo
+        ye += yo
+        bbox = lbwh_to_bbox(xb, yb, w, h)
+        
+        if renderer.flipy():
+            canvasw, canvash = renderer.get_canvas_width_height()
+            yb = canvash-yb
+            ye = canvash-ye            
+        
+            
+        val = ( bbox, ((base, xb, yb), (exponent, xe, ye, fpexp)))
+        self.cached[key] = val
+
+        return val