some polar fixes

jdh2358 · jdh2358 · commit d340c1374ff6 · 2007-04-23T20:58:38.000Z
svn path=/trunk/matplotlib/; revision=3252
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2007-04-23 Fixed some problems with polar -- dded general polygon
+           clipping to clip the lines a nd grids to the polar axes.
+           Added support for set_rmax to easily change the maximum
+           radial grid.  Added support for polar legend
+
 2007-04-16 Added autofmt_xdate to handle adjusting the bottom and
            rotating the tick labels for date plots when the ticks
            often overlap
diff --git a/examples/clippath_test.py b/examples/clippath_test.py
@@ -2,17 +2,21 @@
 from matplotlib.patches import RegularPolygon
 import matplotlib.agg as agg
 
-fig = figure()
-ax = fig.add_subplot(111)
+fig = figure(figsize=(8,8))
+ax = fig.add_subplot(111, aspect='equal')
 t = nx.arange(0.0, 4.0, 0.01)
 s = 2*nx.sin(2*nx.pi*8*t)
 line, = ax.plot(t, s)
 line2, = ax.plot(t, 0.5*s, '--')
 
+
+
 markers, = ax.plot(t, 2*(nx.mlab.rand(len(t))-0.5), 'bo')
 path = agg.path_storage()
-poly = RegularPolygon( (2, 0.), numVertices=100, radius=1.5)
-#for i, xy in enumerate(ax.transData.seq_xy_tups(poly.get_verts())):
+poly = RegularPolygon( (2, 0.), numVertices=100, radius=1.5,
+                       facecolor='yellow', alpha=0.25)
+
+ax.add_patch(poly)
 for i, xy in enumerate(ax.transData.seq_xy_tups(poly.get_verts())):
     if i==0: path.move_to(*xy)
     else:    path.line_to(*xy)
diff --git a/examples/polar_demo.py b/examples/polar_demo.py
@@ -39,20 +39,23 @@
 # See the pylab rgrids and thetagrids functions for
 # information on how to customize the grid locations and labels
 
-from pylab import *
+import matplotlib.numerix as nx
+from pylab import figure, show, rc
 
 # radar green, solid grid lines
-rc('grid', color='red', linewidth=1, linestyle='-')
+rc('grid', color='#316931', linewidth=1, linestyle='-')
 rc('xtick', labelsize=15)
 rc('ytick', labelsize=15)
+
 # force square figure and square axes looks better for polar, IMO
-figure(figsize=(8,8))
-ax = axes([0.1, 0.1, 0.8, 0.8], polar=True, axisbg='#d5de9c')
+fig = figure(figsize=(8,8))
+ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True, axisbg='#d5de9c')
 
-r = arange(0,1,0.001)
-theta = 2*2*pi*r
-polar(theta, r, color='#ee8d18', lw=3)
+r = nx.arange(0, 3.0, 0.01)
+theta = 2*nx.pi*r
+ax.plot(theta, r, color='#ee8d18', lw=3)
+ax.set_rmax(2.0)
 
-title("And there was much rejoicing!", fontsize=20)
-#savefig('polar_demo')
+ax.set_title("And there was much rejoicing!", fontsize=20)
+fig.savefig('polar_demo')
 show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -34,11 +34,12 @@
 import lines
 
 from matplotlib.mlab import meshgrid, detrend_none, detrend_linear, \
-     window_none, window_hanning, linspace, prctile
+     window_none, window_hanning, prctile, linspace
 from matplotlib.numerix.mlab import flipud, amin, amax, dot
 
 from matplotlib import rcParams
-from patches import Patch, Rectangle, Circle, Polygon, Arrow, Wedge, Shadow, FancyArrow, bbox_artist
+from patches import Patch, Rectangle, Circle, Polygon, RegularPolygon,\
+     Arrow, Wedge, Shadow, FancyArrow, bbox_artist
 import table
 from text import Text, TextWithDash, Annotation, _process_text_args
 from transforms import Bbox, Point, Value, Affine, NonseparableTransformation
@@ -2803,6 +2804,7 @@ def xcorr(self, x, y, normed=False, detrend=detrend_none, usevlines=False,
             kwargs.setdefault('marker', 'o')
             kwargs.setdefault('linestyle', 'None')
             a, = self.plot(lags, c, **kwargs)
+            b = None
         return lags, c, a, b
     xcorr.__doc__ = dedent(xcorr.__doc__) % artist.kwdocd
 
@@ -5224,7 +5226,7 @@ class PolarAxes(Axes):
 
     """
 
-    RESOLUTION = 200
+    RESOLUTION = 100
 
     def __init__(self, *args, **kwarg):
         """
@@ -5291,13 +5293,15 @@ def cla(self):
         self._set_artist_props(self.title)
 
 
-        self.thetas = linspace(0,2*math.pi, self.RESOLUTION)
+        self.thetas = linspace(0, 2*math.pi, self.RESOLUTION)
+
         verts = zip(self.thetas, ones(self.RESOLUTION))
         self.axesPatch = Polygon(
             verts,
             facecolor=self._axisbg,
             edgecolor=rcParams['axes.edgecolor'],
             )
+            
 
 
         self.axesPatch.set_figure(self.figure)
@@ -5313,10 +5317,19 @@ def cla(self):
         self.rformatter  = ScalarFormatter()
         self.rformatter.set_view_interval(self.rintv)
         self.rformatter.set_data_interval(self.rintd)
-        self.rlocator = AutoLocator()
+
+        class RadialLocator(AutoLocator):
+            'enforce strictly positive radial ticks'
+
+            def __call__(self):
+                ticks = AutoLocator.__call__(self)
+                return [t for t in ticks if t>0]
+            
+        self.rlocator = RadialLocator()
         self.rlocator.set_view_interval(self.rintv)
         self.rlocator.set_data_interval(self.rintd)
 
+
         angles = arange(0, 360, 45)
         radii = arange(0.2, 1.1, 0.2)
         self.set_thetagrids(angles)
@@ -5334,8 +5347,8 @@ def get_children(self):
         children.extend(self.texts)
         children.extend(self.artists)
         children.extend(self.images)
-        #if self.legend_ is not None:
-        #    children.append(self.legend_)
+        if self.legend_ is not None:
+            children.append(self.legend_)
         children.extend(self.collections)
         children.append(self.title)
         children.append(self.axesPatch)
@@ -5351,12 +5364,15 @@ def grid(self, b):
         self._gridOn = b
 
     def regrid(self, rmax):
+        rmax = float(rmax)
         self.axesPatch.xy = zip(self.thetas, rmax*ones(self.RESOLUTION))
+
         val = rmax*math.sqrt(2)
         self.viewLim.intervaly().set_bounds(val, val)
 
         ticks = self.rlocator()
         self.set_rgrids(ticks)
+        self.rformatter.set_locs(ticks)
 
         for t in self.thetagridlabels:
             t.set_y(1.05*rmax)
@@ -5372,7 +5388,7 @@ def autoscale_view(self, scalex=True, scaley=True):
         self.rintv.set_bounds(rmin, rmax)
         self.regrid(rmax)
 
-    def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
+    def set_rgrids(self, radii, labels=None, angle=22.5, rpad=0.05, **kwargs):
         """
         set the radial locations and labels of the r grids
 
@@ -5383,6 +5399,9 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
 
         if labels is None, the self.rformatter will be used
 
+        rpad is a fraction of the max of radii which will pad each of
+        the radial labels in the radial direction.
+        
         Return value is a list of lines, labels where the lines are
         matplotlib.Line2D instances and the labels are matplotlib.Text
         instances
@@ -5393,12 +5412,21 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
         ACCEPTS: sequence of floats
         """
 
+        
+
+        rmin = nx.amin(radii)
+        if rmin<=0:
+            raise ValueError('radial grids must be strictly positive')
+
+        rpad = rpad * max(radii)
         popall(self.rgridlines)
-        theta = linspace(0,2*math.pi, self.RESOLUTION)
+        
+        theta = linspace(0., 2*math.pi, self.RESOLUTION)
         ls = rcParams['grid.linestyle']
         color = rcParams['grid.color']
         lw = rcParams['grid.linewidth']
 
+        rmax = self.get_rmax()
         for r in radii:
             r = ones(self.RESOLUTION)*r
             line = Line2D(theta, r, linestyle=ls, color=color, linewidth=lw)
@@ -5407,7 +5435,6 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
             line.set_transform(self.transData)
             self.rgridlines.append(line)
 
-
         popall(self.rgridlabels)
 
 
@@ -5418,7 +5445,7 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
         if labels is None:
             labels = [self.rformatter(r,0) for r in radii]
         for r,l in zip(radii, labels):
-            t = Text(angle/180.*math.pi, r, l,
+            t = Text(angle/180.*math.pi, r+rpad, l,
                      fontproperties=props, color=color,
                      horizontalalignment='center', verticalalignment='center')
             t.set_transform(self.transData)
@@ -5460,7 +5487,8 @@ def set_thetagrids(self, angles, labels=None, fmt='%d', frac = 1.1,
         color = rcParams['grid.color']
         lw = rcParams['grid.linewidth']
 
-        r = linspace(0, self.get_rmax(), self.RESOLUTION)
+        rmax = self.get_rmax()
+        r = linspace(0., rmax, self.RESOLUTION)
         for a in angles:
             theta = ones(self.RESOLUTION)*a/180.*math.pi
             line = Line2D(theta, r, linestyle=ls, color=color, linewidth=lw)
@@ -5472,7 +5500,7 @@ def set_thetagrids(self, angles, labels=None, fmt='%d', frac = 1.1,
         color = rcParams['xtick.color']
 
         props=FontProperties(size=rcParams['xtick.labelsize'])
-        r = frac*self.get_rmax()
+        r = frac*rmax
         if labels is None:
             labels = [fmt%a for a in angles]
         for a,l in zip(angles, labels):
@@ -5498,51 +5526,59 @@ def draw(self, renderer):
         self.transData.freeze()  # eval the lazy objects
         self.transAxes.freeze()  # eval the lazy objects
 
-        tverts = self.transData.seq_xy_tups(self.axesPatch.get_verts())
+        verts = self.axesPatch.get_verts()
+        tverts = self.transData.seq_xy_tups(verts)
 
-        def make_clippath():
-            clippath = agg.path_storage()
-            for i, xy in enumerate(tverts):
-                if i==0: clippath.move_to(*xy)
-                else:    clippath.line_to(*xy)
-            clippath.close_polygon()
-            return clippath
+        #for i,v,t in zip(range(len(verts)), verts, tverts):
+        #    print i,v,t
+        
+        
 
+        l,b,w,h = self.figure.bbox.get_bounds()
         clippath = agg.path_storage()
         for i, xy in enumerate(tverts):
-            if i==0: clippath.move_to(*xy)
-            else:    clippath.line_to(*xy)
+            x,y = xy
+            y = h-y
+            if i==0: clippath.move_to(x, y)
+            else:    clippath.line_to(x, y)
         clippath.close_polygon()
 
         #self._update_axes()
         if self.axison:
             if self._frameon: self.axesPatch.draw(renderer)
 
         if self._gridOn:
-            for l in self.rgridlines+self.thetagridlines:
-                #l.set_clip_path(make_clippath())
-                #l.set_clip_path(clippath)
+            for l in self.rgridlines:                
+                l.set_clip_path(clippath)
                 l.draw(renderer)
 
+            for l in self.thetagridlines:
+                l.set_clip_path(clippath)
+                l.draw(renderer)            
+
         for line in self.lines:
-            #line.set_clip_path(make_clippath())
             line.set_clip_path(clippath)
 
-        for t in self.thetagridlabels+self.rgridlabels:
-            t.draw(renderer)
-
         artists = []
         artists.extend(self.lines)
         artists.extend(self.texts)
         artists.extend(self.collections)
         artists.extend(self.patches)
         artists.extend(self.artists)
+
         dsu = [ (a.zorder, a) for a in artists]
         dsu.sort()
 
         for zorder, a in dsu:
             a.draw(renderer)
 
+        
+        for t in self.thetagridlabels+self.rgridlabels:
+            t.draw(renderer)
+
+        if self.legend_ is not None:
+            self.legend_.draw(renderer)
+
         self.title.draw(renderer)
 
 
@@ -5614,12 +5650,6 @@ def toggle_log_lineary(self):
         'toggle between log and linear axes ignored for polar'
         pass
 
-    def legend(self, *args, **kwargs):
-        """
-        LEGEND(*args, **kwargs)
-        Not implemented for polar yet -- use figlegend
-        """
-        raise NotImplementedError('legend not implemented for polar yet -- use figlegend')
 
     def table(self, *args, **kwargs):
         """
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -328,7 +328,7 @@ def get_handles(ax):
 
         inv = ax.transAxes.inverse_xy_tup
         for handle in handles:
-            print 'autolegend', handle, type(handle)
+
             if isinstance(handle, Line2D):
 
                 xdata = handle.get_xdata(orig=False)
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -27,7 +27,7 @@
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
 #     Agg Cairo GD GDK Paint PS PDF SVG Template
 backend      : TkAgg
-numerix      : numpy  # numpy, Numeric or numarray
+numerix      : Numeric  # numpy, Numeric or numarray
 units        : True
 #interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
 #toolbar      : toolbar2   # None | classic | toolbar2
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -444,14 +444,14 @@ def __init__(self, xy, numVertices, radius=5, orientation=0,
     def get_verts(self):
         theta = 2*pi/self.numVertices*arange(self.numVertices) + \
                 self.orientation
-        r = self.radius
-        x, y = self.x, self.y
+        r = float(self.radius)
+        x, y = map(float, self.xy)
 
         xs = x + r*cos(theta)
         ys = y + r*sin(theta)
 
-        xs = self.convert_xunits(xs)
-        ys = self.convert_yunits(ys)
+        #xs = self.convert_xunits(xs)
+        #ys = self.convert_yunits(ys)
 
 
         self.verts = zip(xs, ys)
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -734,8 +734,6 @@ class MultiCursor:
     """
     def __init__(self, canvas, axes, useblit=True, **lineprops):
         self.canvas = canvas
-        self.canvas.mpl_connect('motion_notify_event', self.onmove)
-        self.canvas.mpl_connect('draw_event', self.clear)
         self.axes = axes
         self.lines = [ax.axvline(1, visible=False, **lineprops) for ax in axes]
 
@@ -744,6 +742,9 @@ def __init__(self, canvas, axes, useblit=True, **lineprops):
         self.background = None
         self.needclear = False
 
+        self.canvas.mpl_connect('motion_notify_event', self.onmove)
+        self.canvas.mpl_connect('draw_event', self.clear)
+
 
     def clear(self, event):
         'clear the cursor'
diff --git a/setup.py b/setup.py
@@ -125,8 +125,8 @@
     raise RuntimeError("You must install one or more of numpy, Numeric, and numarray to build matplotlib")
 
 
-#NUMERIX = ['numpy']
-rc['numerix'] = NUMERIX[-1]
+NUMERIX = ['numpy']
+#rc['numerix'] = NUMERIX[-1]
 
 ext_modules = []
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
