SC

Steve Chaplin · Steve Chaplin · commit 493f4259c3dd · 2007-07-08T12:11:48.000Z
svn path=/trunk/matplotlib/; revision=3483
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-07-08 Applied Carl Worth's patch to fix cairo draw_arc - SC
+
 2007-07-07 fixed bug 1712099: xpdf distiller on windows - DSD
 
 2007-06-30 Applied patches to tkagg, gtk, and wx backends to reduce
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -131,19 +131,16 @@ def _fill_and_stroke (self, ctx, fill_c):
     def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2,
                  rotation):
         if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
-        # this implementation draws circular arcs where width=height
-        # FIXME
-        # to get a proper arc of width/height you can use translate() and
-        # scale(), see cairo_arc() manual page
-
         ctx = gc.ctx
         ctx.save()
-        ctx.new_path()  # prevent cairo_arc() adding to current path
+        ctx.translate(x, self.height - y)
         ctx.rotate(rotation)
-        radius = (height + width) / 4
-        ctx.arc (x, self.height - y, radius,
-                 angle1 * numx.pi/180.0, angle2 * numx.pi/180.0)
+        ctx.scale(width / 2.0, height / 2.0)
+        ctx.new_sub_path()
+        ctx.arc(0.0, 0.0, 1.0, numx.pi * angle1 / 180.,
+                numx.pi * angle2 / 180.)
         ctx.restore()
+
         self._fill_and_stroke (ctx, rgbFace)
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-07-08 Applied Carl Worth's patch to fix cairo draw_arc - SC`
	`2`	`+`
`1`	`3`	`2007-07-07 fixed bug 1712099: xpdf distiller on windows - DSD`
`2`	`4`
`3`	`5`	`2007-06-30 Applied patches to tkagg, gtk, and wx backends to reduce`