Function to draw solid ellipses (Boronhub) (#111)

KarthikRIyer · boronhub · web-flow · commit b98ea246a774 · 2020-01-26T22:42:09.000+05:30
* draw ellipse

* Update CAGGRenderer.cpp

* Update CAGGRenderer.h

* Add ellipse function to QuartzRenderer and change radius parameter name

* bfix: fix ellipse function in SVG Renderer

Co-authored-by: boron &lt;31139873+boronhub@users.noreply.github.com&gt;
diff --git a/Sources/AGGRenderer/AGGRenderer/AGGRenderer.swift b/Sources/AGGRenderer/AGGRenderer/AGGRenderer.swift
@@ -123,6 +123,22 @@ public class AGGRenderer: Renderer{
                         agg_object)
     }
 
+   public func drawSolidEllipse(center c: Point,
+                                radiusX rx: Float,
+                                radiusY ry: Float,
+                                fillColor: Color) {
+      draw_solid_ellipse(c.x + xOffset,
+                        c.y + yOffset,
+                        rx,
+                        ry,
+                        fillColor.r,
+                        fillColor.g,
+                        fillColor.b,
+                        fillColor.a,
+                        agg_object)
+    }
+
+
     public func drawSolidTriangle(point1: Point,
                                   point2: Point,
                                   point3: Point,
diff --git a/Sources/AGGRenderer/CAGGRenderer/CAGGRenderer.cpp b/Sources/AGGRenderer/CAGGRenderer/CAGGRenderer.cpp
@@ -26,6 +26,10 @@ void draw_solid_circle(float cx, float cy, float radius, float r, float g, float
   CPPAGGRenderer::draw_solid_circle(cx, cy, radius, r, g, b, a, object);
 }
 
+void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a, const void *object){
+  CPPAGGRenderer::draw_solid_ellipse(cx, cy, rx, ry, r, g, b, a, object);
+}
+
 void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a, const void *object){
   CPPAGGRenderer::draw_solid_triangle(x1, x2, x3, y1, y2, y3, r, g, b, a, object);
 }
diff --git a/Sources/AGGRenderer/CAGGRenderer/include/CAGGRenderer.h b/Sources/AGGRenderer/CAGGRenderer/include/CAGGRenderer.h
@@ -16,6 +16,8 @@ void draw_solid_rect_with_border(const float *x, const float *y, float thickness
 
 void draw_solid_circle(float cx, float cy, float radius, float r, float g, float b, float a, const void *object);
 
+void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a, const void *object);  
+  
 void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a, const void *object);
 
 void draw_solid_polygon(const float* x, const float* y, int count, float r, float g, float b, float a, const void *object);
diff --git a/Sources/AGGRenderer/CPPAGGRenderer/CPPAGGRenderer.cpp b/Sources/AGGRenderer/CPPAGGRenderer/CPPAGGRenderer.cpp
@@ -324,6 +324,21 @@ namespace CPPAGGRenderer{
       agg::render_scanlines(m_ras, m_sl_p8, ren_aa);
     }
 
+    void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a) {
+      agg::rendering_buffer rbuf = agg::rendering_buffer(buffer, frame_width, frame_height, -frame_width*3);
+      pixfmt pixf = pixfmt(rbuf);
+      renderer_base rb = renderer_base(pixf);
+      ren_aa = renderer_aa(rb);
+      agg::ellipse ellipse(cx, cy, rx, ry, 100);
+      Color c(r, g, b, a);
+      agg::trans_affine matrix;
+      matrix *= agg::trans_affine_translation(0, 0);
+      agg::conv_transform<agg::ellipse, agg::trans_affine> trans(ellipse, matrix);
+      m_ras.add_path(trans);
+      ren_aa.color(c);
+      agg::render_scanlines(m_ras, m_sl_p8, ren_aa);
+    }
+
     void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a) {
       agg::rendering_buffer rbuf = agg::rendering_buffer(buffer, frame_width, frame_height, -frame_width*3);
       pixfmt pixf = pixfmt(rbuf);
@@ -539,6 +554,11 @@ namespace CPPAGGRenderer{
     plot -> draw_solid_circle(cx, cy, radius, r, g, b, a);
   }
 
+  void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a, const void *object){
+    Plot *plot = (Plot *)object;
+    plot -> draw_solid_ellipse(cx, cy, rx, ry, r, g, b, a);
+  }
+
   void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a, const void *object){
     Plot *plot = (Plot *)object;
     plot -> draw_solid_triangle(x1, x2, x3, y1, y2, y3, r, g, b, a);
diff --git a/Sources/AGGRenderer/CPPAGGRenderer/include/CPPAGGRenderer.h b/Sources/AGGRenderer/CPPAGGRenderer/include/CPPAGGRenderer.h
@@ -14,6 +14,8 @@ namespace CPPAGGRenderer{
 
   void draw_solid_circle(float cx, float cy, float radius, float r, float g, float b, float a, const void *object);
 
+  void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a, const void *object);
+
   void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a, const void *object);
 
   void draw_solid_polygon(const float* x, const float* y, int count, float r, float g, float b, float a, const void *object);
diff --git a/Sources/QuartzRenderer/QuartzRenderer.swift b/Sources/QuartzRenderer/QuartzRenderer.swift
@@ -348,6 +348,18 @@ public class QuartzRenderer: Renderer {
         context.addEllipse(in: rectBound)
         context.drawPath(using: .fill)
     }
+    
+    public func drawSolidEllipse(center c: Point,
+                                 radiusX rx: Float,
+                                 radiusY ry: Float,
+                                 fillColor: Color) {
+        let ellipse = CGMutablePath()
+        ellipse.addEllipse(in: CGRect(x: CGFloat(c.x-rx), y: CGFloat(c.y-ry), width: CGFloat(rx*2), height: CGFloat(ry*2)),
+                           transform: CGAffineTransform(translationX: CGFloat(xOffset), y: CGFloat(yOffset)))
+        context.setFillColor(fillColor.cgColor)
+        context.addPath(ellipse)
+        context.fillPath()
+    }
 
     public func drawSolidTriangle(point1: Point,
                                   point2: Point,
diff --git a/Sources/SVGRenderer/SVGRenderer.swift b/Sources/SVGRenderer/SVGRenderer.swift
@@ -69,7 +69,7 @@ public class SVGRenderer: Renderer{
         lines.append(rectStr)
         drawHatchingRect(rect, hatchPattern: hatchPattern)
     }
-    
+
     func drawHatchingRect(_ rect: Rect,
                           hatchPattern: BarGraphSeriesOptions.Hatching) {
         let patternName: String
@@ -146,6 +146,15 @@ public class SVGRenderer: Renderer{
         lines.append(circle)
     }
 
+    public func drawSolidEllipse(center c: Point,
+                                 radiusX rx: Float,
+                                 radiusY ry: Float,
+                                 fillColor: Color) {
+        let c = convertToSVGCoordinates(c)
+        let circle: String = #"<ellipse cx="\#(c.x)" cy="\#(c.y)" rx="\#(rx)" ry="\#(ry)" style="fill:\#(fillColor.svgColorString);opacity:\#(fillColor.a)" />"#
+        lines.append(circle)
+    }
+
     public func drawSolidTriangle(point1: Point,
                                   point2: Point,
                                   point3: Point,
diff --git a/Sources/SwiftPlot/Renderer.swift b/Sources/SwiftPlot/Renderer.swift
@@ -129,6 +129,23 @@ public protocol Renderer: AnyObject{
                          radius r: Float,
                          fillColor: Color)
 
+
+    /*drawSolidEllipse()
+    *params: center c: Point,
+    *        radius rx: Float,
+    *        radius rx: Float,
+    *        fillColor: Color,
+    *        isOriginShifted: Bool
+    *description: Draws an ellipse with specified fill color, center and radii
+    *             This function can operate in both coordinate systems with and
+    *             without shifted origin.
+    *             This is decided by the boolean parameter isOriginShifted.
+    */
+    func drawSolidEllipse(center c: Point,
+                          radiusX rx: Float,
+                          radiusY ry: Float,
+                          fillColor: Color)
+
     /*drawSolidTriangle()
     *params: point1: Point,
     *        point2: Point,

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ void draw_solid_circle(float cx, float cy, float radius, float r, float g, float`
`26`	`26`	`CPPAGGRenderer::draw_solid_circle(cx, cy, radius, r, g, b, a, object);`
`27`	`27`	`}`
`28`	`28`
	`29`	`+void draw_solid_ellipse(float cx, float cy, float rx, float ry, float r, float g, float b, float a, const void *object){`
	`30`	`+ CPPAGGRenderer::draw_solid_ellipse(cx, cy, rx, ry, r, g, b, a, object);`
	`31`	`+}`
	`32`	`+`
`29`	`33`	`void draw_solid_triangle(float x1, float x2, float x3, float y1, float y2, float y3, float r, float g, float b, float a, const void *object){`
`30`	`34`	`CPPAGGRenderer::draw_solid_triangle(x1, x2, x3, y1, y2, y3, r, g, b, a, object);`
`31`	`35`	`}`