more backend refactorng and optimizations

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

Author: jdh2358

CHANGELOG

@@ -1,5 +1,13 @@
 New entries should be added at the top
 
+2005-02-10 backend renderer draw_lines now has transform in backend,
+           as in draw_markers; use numerix in _backend_agg
+
+2005-02-09 subplot now deletes axes that it overlaps 
+
+2005-02-08 Added transparent support for gzipped files in load/save - Fernando
+           Perez (FP from now on).
+
 2005-02-08 Small optimizations in PS backend.  They may have a big impact for
            large plots, otherwise they don't hurt  - FP
 

TODO

@@ -642,4 +642,4 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- fix contour mappable to work under changes in clim, cmap
 
--- make subplot delaxes on other subplots under it.
+-- DONE make subplot delaxes on other subplots under it.

lib/matplotlib/axes.py

@@ -686,6 +686,14 @@ def update_datalim(self, xys):
         # and the data in xydata        
         self.dataLim.update(xys, not self.has_data())
 
+    def update_datalim_numerix(self, x, y):
+        'Update the data lim bbox with seq of xy tups'
+        # if no data is set currently, the bbox will ignore it's
+        # limits and set the bound to be the bounds of the xydata.
+        # Otherwise, it will compute the bounds of it's current data
+        # and the data in xydata        
+        self.dataLim.update_numerix(x, y, not self.has_data())
+
     def add_line(self, l):
         'Add a line to the list of plot lines'
         self._set_artist_props(l)        
@@ -697,8 +705,7 @@ def add_line(self, l):
             xys = self._get_verts_in_data_coords(
                 l.get_transform(), zip(xdata, ydata))
             xdata, ydata = zip(*xys)
-
-        self.update_datalim( zip(xdata, ydata) )
+        self.update_datalim_numerix( xdata, ydata )        
 
         self.lines.append(l)
 

lib/matplotlib/backends/backend_agg.py

@@ -84,7 +84,13 @@
 from matplotlib.ft2font import FT2Font
 from matplotlib.mathtext import math_parse_s_ft2font
 
-from _backend_agg import RendererAgg as _RendererAgg
+
+import matplotlib.numerix
+
+if matplotlib.numerix.which[0] == "numarray":
+    from _na_backend_agg import RendererAgg as _RendererAgg
+else:
+    from _nc_backend_agg import RendererAgg as _RendererAgg
 
 backend_version = 'v2.2'
 _fontd = {}     # a map from fname to font instances

lib/matplotlib/lines.py

@@ -14,7 +14,6 @@
 from matplotlib import verbose
 from artist import Artist
 from cbook import iterable, is_string_like
-from collections import RegularPolyCollection, PolyCollection
 from colors import colorConverter
 from patches import bbox_artist
 from path import MOVETO, LINETO, ENDPOLY
@@ -32,8 +31,6 @@
                   TICKDOWN:1,
                   'None':1
                   }
-
-
 
 class Line2D(Artist):
     _lineStyles =  {
@@ -147,7 +144,12 @@ def __init__(self, xdata, ydata,
         self._logcache = None
 
     def get_window_extent(self, renderer):
-        x, y = self._get_numeric_clipped_data_in_range()
+        self._newstyle = hasattr(renderer, 'draw_markers')
+        if self._newstyle:
+            x = self._x
+            y = self._y
+        else:
+            x, y = self._get_numeric_clipped_data_in_range()
 
 
         x, y = self._transform.numerix_x_y(x, y)
@@ -268,8 +270,8 @@ def draw(self, renderer):
             gc.set_clip_rectangle(self.clipbox.get_bounds())
 
 
-        if self._newstyle and self._linestyle == 'None':
-            # we don't need xt
+        if self._newstyle:
+            # transform in backend
             xt = self._x
             yt = self._y
         else:    
@@ -289,9 +291,6 @@ def draw(self, renderer):
             if self.get_clip_on():
                 gc.set_clip_rectangle(self.clipbox.get_bounds())
             markerFunc = getattr(self, self._markerFunc)
-            if self._newstyle:
-                xt = self._x
-                yt = self._y
             markerFunc(renderer, gc, xt, yt)
 
         #if 1: bbox_artist(self, renderer)
@@ -512,14 +511,22 @@ def _draw_steps(self, renderer, gc, xt, yt):
         yt2[0:-1:2], yt2[1::2]=yt, yt
         gc.set_linestyle('solid')
         gc.set_capstyle('projecting')
-        renderer.draw_lines(gc, xt2, yt2)    
+
+        if self._newstyle:
+            renderer.draw_lines(gc, xt2, yt2, self._transform)
+        else:
+            renderer.draw_lines(gc, xt2, yt2)
 
     def _draw_solid(self, renderer, gc, xt, yt):
         if len(xt)<2: return
         gc.set_linestyle('solid')
         gc.set_capstyle('projecting')   
 
-        renderer.draw_lines(gc, xt,yt)
+        if self._newstyle:
+            renderer.draw_lines(gc, xt, yt, self._transform)
+        else:
+            renderer.draw_lines(gc, xt, yt)
+
 
     def _draw_dashed(self, renderer, gc, xt, yt):
         if len(xt)<2: return
@@ -528,14 +535,23 @@ def _draw_dashed(self, renderer, gc, xt, yt):
             gc.set_dashes(0, self._dashSeq)
         gc.set_capstyle('butt')   
         gc.set_joinstyle('miter') 
-        renderer.draw_lines(gc, xt, yt)
+
+        if self._newstyle:
+            renderer.draw_lines(gc, xt, yt, self._transform)
+        else:
+            renderer.draw_lines(gc, xt, yt)
+
 
     def _draw_dash_dot(self, renderer, gc, xt, yt):
         if len(xt)<2: return
         gc.set_linestyle('dashdot')
         gc.set_capstyle('butt')   
         gc.set_joinstyle('miter') 
-        renderer.draw_lines(gc, xt, yt)
+        if self._newstyle:
+            renderer.draw_lines(gc, xt, yt, self._transform)
+        else:
+            renderer.draw_lines(gc, xt, yt)
+
 
 
     def _draw_dotted(self, renderer, gc, xt, yt):
@@ -544,8 +560,10 @@ def _draw_dotted(self, renderer, gc, xt, yt):
         gc.set_linestyle('dotted')
         gc.set_capstyle('butt')   
         gc.set_joinstyle('miter')
-        renderer.draw_lines(gc, xt, yt)
-
+        if self._newstyle:
+            renderer.draw_lines(gc, xt, yt, self._transform)
+        else:
+            renderer.draw_lines(gc, xt, yt)
 
     def _draw_point(self, renderer, gc, xt, yt):
         if self._newstyle:
@@ -603,17 +621,6 @@ def _draw_circle(self, renderer, gc, xt, yt):
                                   x, y, w, h, 0.0, 360.0)
 
 
-    def _draw_circle_collection(self, renderer):        
-        colors = ( colorConverter.to_rgba(self._color, self.get_alpha()), )
-        collection = RegularPolyCollection(
-            self.figure.dpi,
-            numsides=20, rotation=0, sizes=(self._markersize,),
-            facecolors = colors,
-            offsets = zip(self._x, self._y),
-            transOffset = self._transform,             
-            )
-        collection.draw(renderer)
-        
 
     def _draw_triangle_up(self, renderer, gc, xt, yt):
 
@@ -631,8 +638,6 @@ def _draw_triangle_up(self, renderer, gc, xt, yt):
                 )
             renderer.draw_markers(gc, path, xt, yt, self._transform)
         else:
-
-
             for (x,y) in zip(xt, yt):
                 verts = ( (x, y+offset),
                           (x-offset, y-offset),

setup.py

@@ -41,7 +41,7 @@
 BUILD_WINDOWING        = 'auto'
 
 
-VERBOSE = False  # insert lots of diagnostic prints in extension code
+VERBOSE =  False # insert lots of diagnostic prints in extension code
 
 
 
@@ -158,18 +158,18 @@ def add_dateutil():
         print 'pygtk present but import failed'
 if BUILD_GTKAGG:
     BUILD_AGG = 1
-    build_gtkagg(ext_modules, packages)
+    build_gtkagg(ext_modules, packages, NUMERIX)
 
 if BUILD_TKAGG:
     try: import Tkinter
     except ImportError: print 'TKAgg requires TkInter'
     else:
         BUILD_AGG = 1
-        build_tkagg(ext_modules, packages)
+        build_tkagg(ext_modules, packages, NUMERIX)
 
 
 if BUILD_AGG:
-    build_agg(ext_modules, packages)
+    build_agg(ext_modules, packages, NUMERIX)
 
 if BUILD_FT2FONT:
     build_ft2font(ext_modules, packages)

setupext.py

@@ -337,7 +337,7 @@ def build_ft2font(ext_modules, packages):
     ext_modules.append(module)    
     BUILT_FT2FONT = True
 
-def build_gtkagg(ext_modules, packages):
+def build_gtkagg(ext_modules, packages, numerix):
     global BUILT_GTKAGG
     if BUILT_GTKAGG: return # only build it if you you haven't already
     deps = ['src/_gtkagg.cpp', 'src/mplutils.cpp']
@@ -360,7 +360,7 @@ def build_gtkagg(ext_modules, packages):
     ext_modules.append(module)    
     BUILT_GTKAGG = True
 
-def build_tkagg(ext_modules, packages):
+def build_tkagg(ext_modules, packages, numerix):
     global BUILT_TKAGG
     if BUILT_TKAGG: return # only build it if you you haven't already
     module = Extension('matplotlib.backends._tkagg',
@@ -377,24 +377,48 @@ def build_tkagg(ext_modules, packages):
     BUILT_TKAGG = True
 
 
-def build_agg(ext_modules, packages):
+def build_agg(ext_modules, packages, numerix):
     global BUILT_AGG
     if BUILT_AGG: return # only build it if you you haven't already
 
-    deps = ['src/_backend_agg.cpp', 'src/ft2font.cpp', 'src/mplutils.cpp']
-    deps.extend(glob.glob('agg22/src/*.cpp'))
-    deps.extend(glob.glob('CXX/*.cxx'))
-    deps.extend(glob.glob('CXX/*.c'))
 
-    module = Extension(
-        'matplotlib.backends._backend_agg',
-        deps
-        ,
-        )
 
-    add_agg_flags(module)
-    add_ft2font_flags(module)
-    ext_modules.append(module)    
+
+    if numerix in ["numarray","both"]: # Build for numarray
+        deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
+        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps.extend(glob.glob('CXX/*.cxx'))
+        deps.extend(glob.glob('CXX/*.c'))
+        temp_copy('src/_backend_agg.cpp', 'src/_na_backend_agg.cpp')
+        deps.append('src/_na_backend_agg.cpp')
+        module = Extension(
+            'matplotlib.backends._na_backend_agg',
+            deps
+            ,
+            )    
+        module.extra_compile_args.append('-DNUMARRAY=1')
+        add_agg_flags(module)
+        add_ft2font_flags(module)
+        ext_modules.append(module)    
+    if numerix in ["Numeric","both"]: # Build for Numeric
+        deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
+        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps.extend(glob.glob('CXX/*.cxx'))
+        deps.extend(glob.glob('CXX/*.c'))
+
+        temp_copy('src/_backend_agg.cpp', 'src/_nc_backend_agg.cpp')
+        deps.append('src/_nc_backend_agg.cpp')
+        module = Extension(
+            'matplotlib.backends._nc_backend_agg',
+            deps
+            ,
+            )
+        module.extra_compile_args.append('-DNUMERIC=1')
+
+        add_agg_flags(module)
+        add_ft2font_flags(module)
+        ext_modules.append(module)    
+
     BUILT_AGG = True
 
 def build_image(ext_modules, packages, numerix):