added scale free ellipse to agg

cmoad · cmoad · commit 63e443fa8c0c · 2006-08-11T17:49:27.000Z
svn path=/trunk/matplotlib/; revision=2673
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,10 +1,12 @@
+2006-08-11 Added scale free Ellipse patch for Agg - CM
+
 2006-08-10 Added converters to and from julian dates to matplotlib.dates
            (num2julian and julian2num) - JDH
 
 2006-08-08 Fixed widget locking so multiple widgets could share the
            event handling - JDH
 
-2006-08-07 Added scale free Ellipse patch
+2006-08-07 Added scale free Ellipse patch to SVG and PS - CM
 
 2006-08-05 Re-organized imports in numerix for numpy 1.0b2 -- TEO
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -188,11 +188,11 @@ GCAgg::_set_clip_rectangle( const Py::Object& gc) {
 
 
 Py::Object BufferRegion::to_string(const Py::Tuple &args) {
-  
+
   // owned=true to prevent memory leak
   return Py::String(PyString_FromStringAndSize((const char*)aggbuf.data,aggbuf.height*aggbuf.stride), true);
-} 
-	 	      
+}
+
 
 
 
@@ -385,8 +385,14 @@ RendererAgg::draw_ellipse(const Py::Tuple& args) {
 
   set_clipbox_rasterizer(gc.cliprect);
 
-  //last arg is num steps
-  agg::ellipse path(x, height-y, w, h, 100);
+  // Approximate the ellipse with 4 bezier paths
+  agg::path_storage path;
+  path.move_to(x, height-(y+h));
+  path.arc_to(w, h, 0.0, false, true, x+w, height-y);
+  path.arc_to(w, h, 0.0, false, true, x, height-(y-h));
+  path.arc_to(w, h, 0.0, false, true, x-w, height-y);
+  path.arc_to(w, h, 0.0, false, true, x, height-(y+h));
+  path.close_polygon();
 
   _fill_and_stroke(path, gc, face);
   return Py::Object();
@@ -640,7 +646,7 @@ RendererAgg::copy_from_bbox(const Py::Tuple& args) {
   */
   int boxwidth = r.x2-r.x1;
   int boxheight = r.y2-r.y1;
-  int boxstride = boxwidth*4; 
+  int boxstride = boxwidth*4;
   agg::buffer buf(boxwidth, boxheight, boxstride, false);
   if (buf.data ==NULL) {
     throw Py::MemoryError("RendererAgg::copy_from_bbox could not allocate memory for buffer");
@@ -2186,7 +2192,7 @@ RendererAgg::buffer_rgba(const Py::Tuple& args) {
   int row_len = width*4;
   int start=row_len*starth+startw*4;
   return Py::asObject(PyBuffer_FromMemory( pixBuffer+start, row_len*height-start));
-} 
+}
 
 
 
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -10,6 +10,7 @@
 
 #include "agg_arrowhead.h"
 #include "agg_basics.h"
+#include "agg_bezier_arc.h"
 #include "agg_color_rgba.h"
 #include "agg_conv_concat.h"
 #include "agg_conv_contour.h"
@@ -76,17 +77,17 @@ class GCAgg {
   double dpi;
   bool snapto;
   bool isaa;
-  
-  agg::line_cap_e cap; 
+
+  agg::line_cap_e cap;
   agg::line_join_e join;
 
-  
+
   double linewidth;
   double alpha;
   agg::rgba color;
 
   double *cliprect;
-  
+
   //dashes
   size_t Ndash;
   double dashOffset;
@@ -138,11 +139,11 @@ class RendererAgg: public Py::PythonExtension<RendererAgg> {
   Py::Object copy_from_bbox(const Py::Tuple & args);
   Py::Object restore_region(const Py::Tuple & args);
 
-  
-  
 
 
-  virtual ~RendererAgg(); 
+
+
+  virtual ~RendererAgg();
 
   static const size_t PIXELS_PER_INCH;
   unsigned int width, height;
@@ -177,7 +178,7 @@ class RendererAgg: public Py::PythonExtension<RendererAgg> {
   agg::rgba rgb_to_color(const Py::SeqBase<Py::Object>& rgb, double alpha);
   facepair_t _get_rgba_face(const Py::Object& rgbFace, double alpha);
   void set_clipbox_rasterizer( double *cliprect);
-  template <class VS> void _fill_and_stroke(VS&, const GCAgg&, const facepair_t&, bool curvy=true);  
+  template <class VS> void _fill_and_stroke(VS&, const GCAgg&, const facepair_t&, bool curvy=true);
 
   template<class PathSource>
   void _render_lines_path(PathSource &ps, const GCAgg& gc);
@@ -195,19 +196,19 @@ class _backend_agg_module : public Py::ExtensionModule<_backend_agg_module>
     BufferRegion::init_type();
     RendererAgg::init_type();
 
-    add_keyword_method("RendererAgg", &_backend_agg_module::new_renderer, 
+    add_keyword_method("RendererAgg", &_backend_agg_module::new_renderer,
 		       "RendererAgg(width, height, dpi)");
     initialize( "The agg rendering backend" );
   }
-  
+
   virtual ~_backend_agg_module() {}
-  
+
 private:
-  
+
   Py::Object new_renderer (const Py::Tuple &args, const Py::Dict &kws);
 
 
-  
+
 };
 
 
