CS

Steve Chaplin · Steve Chaplin · commit 852e4e3dd58a · 2007-01-14T06:35:26.000Z
svn path=/trunk/matplotlib/; revision=2982
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-01-14 backend_cairo.py: update draw_arc() so that
+           examples/arctest.py looks correct - SC
+
 2007-01-12 backend_cairo.py: enable clipping. Update draw_image() so that
            examples/contour_demo.py looks correct - SC
 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -34,7 +34,8 @@ def close_group(self, s):
         pass
 
 
-    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2, rotation):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2,
+                 rotation):
         """
         Draw an arc using GraphicsContext instance gcEdge, centered at x,y,
         with width and height and angles from 0.0 to 360.0
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -128,24 +128,22 @@ def _fill_and_stroke (self, ctx, fill_c):
         #_.ctx.restore() # revert to the default attributes
 
 
-    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2, rotation):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2,
+                 rotation):
         if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
-        # draws circular arcs where width=height
+        # this implementation draws circular arcs where width=height
         # FIXME
         # to get a proper arc of width/height you can use translate() and
-        # scale(), see draw_arc() manual page
+        # scale(), see cairo_arc() manual page
 
-        #radius = (height + width) / 4
         ctx = gc.ctx
         ctx.save()
+        ctx.new_path()  # prevent cairo_arc() adding to current path
         ctx.rotate(rotation)
-        ctx.scale(width / 2.0, height / 2.0)
-        ctx.arc(0.0, 0.0, 1.0, 0.0, 2*numx.pi)
+        radius = (height + width) / 4
+        ctx.arc (x, self.height - y, radius,
+                 angle1 * numx.pi/180.0, angle2 * numx.pi/180.0)
         ctx.restore()
-
-        #ctx.new_path()
-        #ctx.arc (x, self.height - y, radius,
-        #         angle1 * numx.pi/180.0, angle2 * numx.pi/180.0)
         self._fill_and_stroke (ctx, rgbFace)
 
 
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
@@ -32,7 +32,7 @@
   matplotlib/backends/__init__.py
   matplotlib/__init__.py
   matplotlib/_pylab_helpers.py
-  
+
 Naming Conventions
 
   * classes Upper or MixedUpperCase
@@ -62,15 +62,16 @@ class RendererTemplate(RendererBase):
     writing a new backend. Refer to backend_bases.RendererBase for
     documentation of the classes methods.
     """
-    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2, rotation):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2,
+                 rotation):
         pass
-    
+
     def draw_image(self, x, y, im, bbox):
         pass
-    
+
     def draw_line(self, gc, x1, y1, x2, y2):
         pass
-    
+
     def draw_lines(self, gc, x, y):
         pass
 
@@ -83,18 +84,18 @@ def draw_polygon(self, gcEdge, rgbFace, points):
     def draw_rectangle(self, gcEdge, rgbFace, x, y, width, height):
         pass
 
-    def draw_text(self, gc, x, y, s, prop, angle, ismath=False):    
+    def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
         pass
-         
+
     def flipy(self):
         return True
-    
+
     def get_canvas_width_height(self):
         return 100, 100
 
     def get_text_width_height(self, s, prop, ismath):
         return 1, 1
-                              
+
     def new_gc(self):
         return GraphicsContextTemplate()
 
@@ -129,10 +130,10 @@ class GraphicsContextTemplate(GraphicsContextBase):
     """
     pass
 
-        
-        
+
+
 ########################################################################
-#    
+#
 # The following functions and classes are for pylab and implement
 # window/figure managers, etc...
 #
@@ -196,7 +197,7 @@ def draw(self):
         """
         renderer = RendererTemplate()
         self.figure.draw(renderer)
-        
+
     def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
@@ -221,7 +222,7 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
         # set the new parameters
         self.figure.dpi.set(dpi)
         self.figure.set_facecolor(facecolor)
-        self.figure.set_edgecolor(edgecolor)        
+        self.figure.set_edgecolor(edgecolor)
 
         renderer = RendererTemplate()
         self.figure.draw(renderer)
@@ -233,8 +234,8 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
         #self.figure.set_edgecolor(origedgecolor)
         # redraw the screen if necessary
         #self.draw()
-        
-    
+
+
 class FigureManagerTemplate(FigureManagerBase):
     """
     Wrap everything up into a window for the pylab interface
@@ -244,9 +245,9 @@ class FigureManagerTemplate(FigureManagerBase):
     pass
 
 ########################################################################
-#    
+#
 # Now just provide the standard names that backend.__init__ is expecting
-# 
+#
 ########################################################################
 
 
