SC

Steve Chaplin · Steve Chaplin · commit e333c78db0f6 · 2007-01-12T07:55:15.000Z
svn path=/trunk/matplotlib/; revision=2981
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-01-12 backend_cairo.py: enable clipping. Update draw_image() so that
+           examples/contour_demo.py looks correct - SC
+
 2007-01-12 backend_cairo.py: fix draw_image() so that examples/image_demo.py
            now looks correct - SC
 
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -170,6 +170,7 @@ def draw_image(self, x, y, im, bbox):
 
         # function does not pass a 'gc' so use renderer.ctx
         ctx = self.ctx
+        y = self.height - y - rows
         ctx.set_source_surface (surface, x, y)
         ctx.paint()
 
@@ -472,11 +473,9 @@ def set_clip_rectangle(self, rectangle):
         ctx = self.ctx
         ctx.new_path()
         ctx.rectangle (x, self.renderer.height - h - y, w, h)
-
-        # enabline ctx.clip() causes problems:
-        # line_styles.py - only see first axes
-        # simple_plot.py - lose text
-        #ctx.clip ()
+        ctx.clip ()
+        # Alternative: just set _cliprect here and actually set cairo clip rect
+        # in fill_and_stroke() inside ctx.save() ... ctx.restore()
 
 
     def set_dashes(self, offset, dashes):
