Merged revisions 6997,7001 via svnmerge from

mdboom · mdboom · commit 76c9dd052eca · 2009-03-23T19:18:35.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6997 | mdboom | 2009-03-19 09:15:00 -0400 (Thu, 19 Mar 2009) | 2 lines Fix bug in Cairo backend related to clipping -- thanks Nathaniel Smith ........ r7001 | ryanmay | 2009-03-23 14:52:29 -0400 (Mon, 23 Mar 2009) | 1 line Fix typo. Thanks to Sandro Tosi. ........ svn path=/trunk/matplotlib/; revision=7002
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -82,7 +82,7 @@ Pie charts
 ==========
 
 The :func:`~matplotlib.pyplot.pie` command
-uses a matlab(TM) compatible syntax to produce py charts.  Optional
+uses a matlab(TM) compatible syntax to produce pie charts.  Optional
 features include auto-labeling the percentage of area, exploding one
 or more wedges out from the center of the pie, and a shadow effect.
 Take a close look at the attached code that produced this figure; nine
@@ -268,6 +268,3 @@ matplotlib in a wx application, see
 :ref:`user_interfaces-mpl_with_glade`.
 
 .. image:: ../_static/eeg_small.png
-
-
-
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -109,6 +109,23 @@ def set_width_height(self, width, height):
         # font transform?
 
 
+    def _do_clip(self, ctx, cliprect, clippath):
+        if cliprect is not None:
+            x,y,w,h = cliprect.bounds
+            # pixel-aligned clip-regions are faster
+            x,y,w,h = round(x), round(y), round(w), round(h)
+            ctx.new_path()
+            ctx.rectangle (x, self.height - h - y, w, h)
+            ctx.clip ()
+
+        if clippath is not None:
+            tpath, affine = clippath.get_transformed_path_and_affine()
+            ctx.new_path()
+            affine = affine + Affine2D().scale(1.0, -1.0).translate(0.0, self.height)
+            tpath = affine.transform_path(tpath)
+            RendererCairo.convert_path(ctx, tpath)
+            ctx.clip()
+
     def _fill_and_stroke (self, ctx, fill_c, alpha):
         if fill_c is not None:
             ctx.save()
@@ -120,7 +137,6 @@ def _fill_and_stroke (self, ctx, fill_c, alpha):
             ctx.restore()
         ctx.stroke()
 
-
     @staticmethod
     def convert_path(ctx, path, transform):
         for points, code in path.iter_segments(transform):
@@ -143,13 +159,17 @@ def draw_path(self, gc, path, transform, rgbFace=None):
            raise ValueError("The Cairo backend can not draw paths longer than 18980 points.")
 
         ctx = gc.ctx
+        ctx.save()
+        self._do_clip(ctx, gc._cliprect, gc._clippath)
+
         transform = transform + \
             Affine2D().scale(1.0, -1.0).translate(0, self.height)
 
         ctx.new_path()
         self.convert_path(ctx, path, transform)
 
         self._fill_and_stroke(ctx, rgbFace, gc.get_alpha())
+        ctx.restore()
 
     def draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None):
         # bbox - not currently used
@@ -162,9 +182,16 @@ def draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None):
                       buf, cairo.FORMAT_ARGB32, cols, rows, cols*4)
         # function does not pass a 'gc' so use renderer.ctx
         ctx = self.ctx
+        ctx.save()
+        if clippath is not None:
+            tpath = clippath_trans.transform_path(clippath)
+            ctx.new_path()
+            RendererCairo.convert_path(ctx, tpath)
+            ctx.clip()
         y = self.height - y - rows
         ctx.set_source_surface (surface, x, y)
         ctx.paint()
+        ctx.restore()
 
         im.flipud_out()
 
@@ -322,29 +349,9 @@ def set_capstyle(self, cs):
 
     def set_clip_rectangle(self, rectangle):
         self._cliprect = rectangle
-        if rectangle is None:
-           return
-
-        x,y,w,h = rectangle.bounds
-        # pixel-aligned clip-regions are faster
-        x,y,w,h = round(x), round(y), round(w), round(h)
-        ctx = self.ctx
-        ctx.new_path()
-        ctx.rectangle (x, self.renderer.height - h - y, w, h)
-        ctx.clip ()
-        # Alternative: just set _cliprect here and actually set cairo clip rect
-        # in fill_and_stroke() inside ctx.save() ... ctx.restore()
-
 
     def set_clip_path(self, path):
-        if path is not None:
-            tpath, affine = path.get_transformed_path_and_affine()
-            ctx = self.ctx
-            ctx.new_path()
-            affine = affine + Affine2D().scale(1.0, -1.0).translate(0.0, self.renderer.height)
-            RendererCairo.convert_path(ctx, path, affine)
-            ctx.clip()
-
+        self._clippath = path
 
     def set_dashes(self, offset, dashes):
         self._dashes = offset, dashes
