Added ellipse rotation

cmoad · cmoad · commit 31457474abb6 · 2006-09-01T12:53:49.000Z
svn path=/trunk/matplotlib/; revision=2740
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,7 @@
+	Renderer.draw_arc now takes an additional parameter, rotation.
+	It specifies to draw the artist rotated in degrees anti-
+	clockwise.  It was added for rotated ellipses.
+
 	Renamed Figure.set_figsize_inches to Figure.set_size_inches to
 	better match the get method, Figure.get_size_inches.
 
diff --git a/examples/ellipse_demo.py b/examples/ellipse_demo.py
@@ -0,0 +1,19 @@
+from pylab import *
+from matplotlib.patches import Ellipse
+
+NUM = 250
+
+ells = [Ellipse(rand(2)*10, rand(), rand(), rand()*360) for i in xrange(NUM)]
+
+a = subplot(111)
+for e in ells:
+    a.add_artist(e)
+    e.set_clip_box(a.bbox)
+    e.set_alpha(rand())
+    e.set_facecolor(rand(3))
+
+xlim(0, 10)
+ylim(0, 10)
+
+savefig('ellipse_demo')
+show()
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -33,12 +33,13 @@ def close_group(self, s):
         """
         pass
 
-    def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2):
+    def draw_arc(self, gcEdge, 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
         0 degrees is at 3-o'clock
         positive angles are anti-clockwise
+        draw rotated 'rotation' degrees anti-clockwise about x,y
 
         If the color rgbFace is not None, fill the arc with it.
         """
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -137,7 +137,7 @@ def __init__(self, width, height, dpi):
         if __debug__: verbose.report('RendererAgg.__init__ done',
                                      'debug-annoying')
 
-    def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2):
+    def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2, rotation):
         """        
         Draw an arc centered at x,y with width and height and angles
         from 0.0 to 360.0
@@ -150,7 +150,7 @@ def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2):
         """
         if __debug__: verbose.report('RendererAgg.draw_arc', 'debug-annoying')
         self._renderer.draw_ellipse(
-            gcEdge, rgbFace, x, y, width/2, height/2)  # ellipse takes radius
+            gcEdge, rgbFace, x, y, width/2, height/2, rotation)  # ellipse takes radius
 
 
     def draw_line(self, gc, x1, y1, x2, y2):
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -128,17 +128,24 @@ 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):
+    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
         # FIXME
         # to get a proper arc of width/height you can use translate() and
         # scale(), see draw_arc() manual page
-        radius = (height + width) / 4
+        
+        #radius = (height + width) / 4
         ctx = gc.ctx
-        ctx.new_path()
-        ctx.arc (x, self.height - y, radius,
-                 angle1 * numx.pi/180.0, angle2 * numx.pi/180.0)
+        ctx.save()
+        ctx.rotate(rotation)
+        ctx.scale(width / 2.0, height / 2.0)
+        ctx.arc(0.0, 0.0, 1.0, 0.0, 2*numx.pi)
+        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_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -309,16 +309,16 @@ def _get_font_ttf(self, prop):
         font.set_size(size, 72.0)
         return font
 
-    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2, rotation):
         """
         Draw an arc centered at x,y with width and height and angles
         from 0.0 to 360.0
 
         If gcFace is not None, fill the arc slice with it.  gcEdge
         is a GraphicsContext instance
         """
-        ps = '%s ellipse' % _nums_to_str(angle1, angle2,
-                                         0.5*width, 0.5*height, x, y)
+        ps = '%f %f translate\n%f rotate\n%f %f translate\n%s ellipse' % \
+            (x, y, rotation, -x, -y, _nums_to_str(angle1, angle2, 0.5*width, 0.5*height, x, y))
         self._draw_ps(ps, gc, rgbFace, "arc")
 
     def _rgba(self, im):
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -122,11 +122,12 @@ def open_group(self, s):
     def close_group(self, s):
         self._svgwriter.write('</g>\n')
 
-    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2, rotation):
         """
         Ignores angles for now
         """
-        details = 'cx="%f" cy="%f" rx="%f" ry="%f"' % (x,self.height-y,width/2,height/2)
+        details = 'cx="%f" cy="%f" rx="%f" ry="%f" transform="rotate(%f %f %f)"' % \
+            (x,  self.height-y, width/2.0, height/2.0, -rotation, x, self.height-y)
         self._draw_svg_element('ellipse', details, gc, rgbFace)
 
     def draw_image(self, x, y, im, bbox):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -615,7 +615,7 @@ def _draw_circle(self, renderer, gc, xt, yt, point=False):
         else:
             for (x,y) in zip(xt, yt):
                 renderer.draw_arc(gc, rgbFace,
-                                  x, y, w, w, 0.0, 360.0)
+                                  x, y, w, w, 0.0, 360.0, 0.0)
 
 
 
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -524,11 +524,12 @@ class Ellipse(Patch):
     """
     A scale-free ellipse
     """
-    def __init__(self, xy, width, height, **kwargs):
+    def __init__(self, xy, width, height, angle=0.0, **kwargs):
         Patch.__init__(self, **kwargs)
 
         self.center  = array(xy, Float)
         self.width, self.height = width, height
+        self.angle = angle
         
         x,y = self.center
         l,r = x-width/2.0, x+width/2.0
@@ -565,7 +566,7 @@ def draw(self, renderer):
         width = tverts[3,0] - tverts[1,0]
         height = tverts[2,1] - tverts[4,1]
 
-        renderer.draw_arc(gc, rgbFace, tverts[0,0], tverts[0,1], width, height, 0.0, 360.0)
+        renderer.draw_arc(gc, rgbFace, tverts[0,0], tverts[0,1], width, height, 0.0, 360.0, self.angle)
         
 class Circle(Ellipse):
     """
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -372,7 +372,7 @@ RendererAgg::draw_rectangle(const Py::Tuple & args) {
 Py::Object
 RendererAgg::draw_ellipse(const Py::Tuple& args) {
   _VERBOSE("RendererAgg::draw_ellipse");
-  args.verify_length(6);
+  args.verify_length(7);
 
   GCAgg gc = GCAgg(args[0], dpi);
   facepair_t face = _get_rgba_face(args[1], gc.alpha);
@@ -382,6 +382,7 @@ RendererAgg::draw_ellipse(const Py::Tuple& args) {
   double y = Py::Float( args[3] );
   double w = Py::Float( args[4] );
   double h = Py::Float( args[5] );
+  double rot = Py::Float( args[6] );
 
   set_clipbox_rasterizer(gc.cliprect);
 
