some support for path based clipping

jdh2358 · jdh2358 · commit 9b9e06349d3e · 2007-03-19T03:02:45.000Z
svn path=/trunk/matplotlib/; revision=3093
diff --git a/examples/clippath_test.py b/examples/clippath_test.py
@@ -7,17 +7,16 @@
 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)
-line3, = ax.plot(t, 4*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=8, radius=1.5)
+poly = RegularPolygon( (2, 0.), numVertices=100, radius=1.5)
 #for i, xy in enumerate(ax.transData.seq_xy_tups(poly.get_verts())):
 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)
 path.close_polygon()
 line.set_clip_path(path)
 line2.set_clip_path(path)
-line3.set_clip_path(path)
 show()
diff --git a/examples/polar_demo.py b/examples/polar_demo.py
@@ -42,7 +42,7 @@
 from pylab import *
 
 # radar green, solid grid lines
-rc('grid', color='#316931', linewidth=1, linestyle='-')
+rc('grid', color='red', linewidth=1, linestyle='-')
 rc('xtick', labelsize=15)
 rc('ytick', labelsize=15)
 # force square figure and square axes looks better for polar, IMO
@@ -54,5 +54,5 @@
 polar(theta, r, color='#ee8d18', lw=3)
 
 title("And there was much rejoicing!", fontsize=20)
-savefig('polar_demo')
+#savefig('polar_demo')
 show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -9,7 +9,7 @@
      typecode, concatenate, newaxis, reshape, resize, repeat, cross_correlate, nonzero
 
 import numerix.ma as ma
-
+import matplotlib.numerix as nx
 import matplotlib.mlab
 import matplotlib.agg as agg
 import artist
@@ -5109,6 +5109,8 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
         for r in radii:
             r = ones(self.RESOLUTION)*r
             line = Line2D(theta, r, linestyle=ls, color=color, linewidth=lw)
+            #line = Line2D(nx.mlab.rand(len(theta)), nx.mlab.rand(len(theta)),
+            #              linestyle=ls, color=color, linewidth=lw)
             line.set_transform(self.transData)
             self.rgridlines.append(line)
 
@@ -5231,8 +5233,7 @@ def make_clippath():
 
         for line in self.lines:
             #line.set_clip_path(make_clippath())
-            #line.set_clip_path(clippath)
-            pass
+            line.set_clip_path(clippath)
         
         for t in self.thetagridlabels+self.rgridlabels:
             t.draw(renderer)
@@ -5250,6 +5251,9 @@ def make_clippath():
             a.draw(renderer)
 
         self.title.draw(renderer)
+
+            
+
         self.transData.thaw()  # release the lazy objects
         self.transAxes.thaw()  # release the lazy objects
         renderer.close_group('polar_axes')
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1439,8 +1439,9 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
   double lastx(-2.0), lasty(-2.0);
 
   size_t i(0);
+  bool more(true);
   for (i=0; i<Nx; i++) {
-
+    more = true;
     thisx = *(double *)(xa->data + i*xa->strides[0]);
     thisy = *(double *)(ya->data + i*ya->strides[0]);
 
@@ -1487,9 +1488,11 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
     moveto = false;
     if ((i>0) & (i%10000)==0) {
       //draw the path in chunks
+      //std::cout << "rendering chunk " << i << std::endl;
       _render_lines_path(path, gc);
       path.remove_all();
       path.move_to(thisx, thisy);
+      more = false;
     }
 
 
@@ -1502,8 +1505,9 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
   //typedef agg::conv_transform<agg::path_storage, agg::trans_affine> path_t;
   //path_t transpath(path, xytrans);
   _VERBOSE("RendererAgg::draw_lines rendering lines path");
-  if ((i>0) & ((i%10000)!=0)) {
+  if (more){
     //render the rest
+    ///std::cout << "rendering the rest" << std::endl;
     _render_lines_path(path, gc);
   }
 
@@ -1520,11 +1524,11 @@ RendererAgg::_process_alpha_mask(const GCAgg& gc)
   if (gc.clippath==NULL) {
     return false;
   }
-  if (gc.clippath==lastclippath) {
+  if (0 &(gc.clippath==lastclippath)) {
     //std::cout << "seen it" << std::endl;
     return true;
   }
-  rendererBaseAlphaMask->clear(agg::gray8(0,0));
+  rendererBaseAlphaMask->clear(agg::gray8(0, 0));
   gc.clippath->rewind(0);
   theRasterizer->add_path(*(gc.clippath));
   rendererAlphaMask->color(agg::gray8(255,255));
@@ -1576,6 +1580,7 @@ RendererAgg::_render_lines_path(PathSource &path, const GCAgg& gc) {
       typedef agg::renderer_scanline_aa_solid<amask_ren_type> renderer_type;
       renderer_type ren(r);
       ren.color(gc.color);
+      //std::cout << "render clippath" << std::endl;
       agg::render_scanlines(*theRasterizer, *slineP8, ren);
     }
     else {
