Added single renderer function to draw Rectangles (#95)

Author: boronhub

Sources/AGGRenderer/AGGRenderer/AGGRenderer.swift

@@ -19,7 +19,7 @@ public class AGGRenderer: Renderer{
         self.imageSize = Size(width: w, height: h)
         self.agg_object = initializePlot(imageSize.width, imageSize.height, fontPath)
     }
-    
+
     func getPoints(from rect: Rect) -> (tL: Point, tR: Point, bL: Point, bR: Point) {
         let rect = rect.normalized
         return (
@@ -95,22 +95,19 @@ public class AGGRenderer: Renderer{
         y.append(pts.bR.y + yOffset)
         y.append(pts.bL.y + yOffset)
 
-        draw_solid_rect(x,
+        draw_solid_rect_with_border(
+                        x,
                         y,
+                        thickness,
                         fillColor.r,
                         fillColor.g,
                         fillColor.b,
                         fillColor.a,
-                        0,
+                        borderColor.r,
+                        borderColor.g,
+                        borderColor.b,
+                        borderColor.a,
                         agg_object)
-        draw_rect(x,
-                  y,
-                  thickness,
-                  borderColor.r,
-                  borderColor.g,
-                  borderColor.b,
-                  borderColor.a,
-                  agg_object)
     }
 
     public func drawSolidCircle(center c: Point,
@@ -233,7 +230,7 @@ public class AGGRenderer: Renderer{
         get_text_size(text, size, &width, &height, agg_object)
         return Size(width: width, height: height)
     }
-    
+
     struct DrawOutputError: Error, CustomStringConvertible {
         let errorCode: UInt32
         let description: String
@@ -251,7 +248,7 @@ public class AGGRenderer: Renderer{
       var _bufferPtr: UnsafeMutablePointer<UInt8>?
       var errorDescPtr: UnsafePointer<Int8>?
       var bufferSize = 0
-      
+
       let err = create_png_buffer(&_bufferPtr, &bufferSize, &errorDescPtr, agg_object)
       guard let bufferPtr = _bufferPtr, err == 0 else {
         // We'll probably never make this throwing, but log the error all the same.
@@ -261,13 +258,13 @@ public class AGGRenderer: Renderer{
         )
         return ""
       }
-      
+
       let base64String = Data(
         bytesNoCopy: UnsafeMutableRawPointer(mutating: bufferPtr),
         count: bufferSize,
         deallocator: .none
       ).base64EncodedString()
-      
+
       free_png_buffer(&_bufferPtr)
       return base64String
     }

Sources/AGGRenderer/CAGGRenderer/CAGGRenderer.cpp

@@ -18,6 +18,10 @@ void draw_solid_rect(const float *x, const float *y, float r, float g, float b,
   CPPAGGRenderer::draw_solid_rect(x, y, r, g, b, a, hatch_pattern, object);
 }
 
+void draw_solid_rect_with_border(const float *x, const float *y, float thickness, float r_fill, float g_fill, float b_fill, float a_fill, float r_stroke, float g_stroke, float b_stroke, float a_stroke, const void *object){
+  CPPAGGRenderer::draw_solid_rect_with_border(x, y, thickness, r_fill, g_fill, b_fill, a_fill, r_stroke, g_stroke, b_stroke, a_stroke, object);
+}
+
 void draw_solid_circle(float cx, float cy, float radius, float r, float g, float b, float a, const void *object){
   CPPAGGRenderer::draw_solid_circle(cx, cy, radius, r, g, b, a, object);
 }

Sources/AGGRenderer/CAGGRenderer/include/CAGGRenderer.h

@@ -12,6 +12,8 @@ void draw_rect(const float *x, const float *y, float thickness, float r, float g
 
 void draw_solid_rect(const float *x, const float *y, float r, float g, float b, float a, int hatch_pattern, const void *object);
 
+void draw_solid_rect_with_border(const float *x, const float *y, float thickness, float r_fill, float g_fill, float b_fill, float a_fill, float r_stroke, float g_stroke, float b_stroke, float a_stroke, const void *object);
+
 void draw_solid_circle(float cx, float cy, float radius, 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);

Sources/AGGRenderer/CPPAGGRenderer/CPPAGGRenderer.cpp

@@ -279,6 +279,36 @@ namespace CPPAGGRenderer{
       agg::render_scanlines(m_ras, m_sl_p8, ren_aa);
     }
 
+    void draw_solid_rect_with_border(const float *x, const float *y, float thickness, float r_fill, float g_fill, float b_fill, float a_fill, float r_stroke, float g_stroke, float b_stroke, float a_stroke){
+      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);
+      pixfmt_pre pixf_pre(rbuf);
+      renderer_base_pre rb_pre(pixf_pre);
+      agg::path_storage rect_path;
+      rect_path.move_to(*x, *y);
+      for (int i = 1; i < 4; i++) {
+        rect_path.line_to(*(x+i),*(y+i));
+      }
+      rect_path.close_polygon();
+      agg::trans_affine matrix;
+      matrix *= agg::trans_affine_translation(0, 0);
+      agg::conv_transform<agg::path_storage, agg::trans_affine> trans(rect_path, matrix);
+      Color c1(r_fill, g_fill, b_fill, a_fill);
+      m_ras.add_path(trans);
+      ren_aa.color(c1);
+      agg::render_scanlines(m_ras, m_sl_p8, ren_aa);
+      agg::conv_curve<agg::conv_transform<agg::path_storage, agg::trans_affine>> curve(trans);
+      agg::conv_stroke<agg::conv_curve<agg::conv_transform<agg::path_storage, agg::trans_affine>>> stroke(curve);
+      stroke.width(thickness);
+      m_ras.add_path(stroke);
+      Color c2(r_stroke, g_stroke, b_stroke, a_stroke);
+      ren_aa.color(c2);
+      agg::render_scanlines(m_ras, m_sl_p8, ren_aa);
+
+    }
+
     void draw_solid_circle(float cx, float cy, float radius, 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);
@@ -499,6 +529,11 @@ namespace CPPAGGRenderer{
     plot -> draw_solid_rect(x, y, r, g, b, a, hatch_pattern);
   }
 
+  void draw_solid_rect_with_border(const float *x, const float *y, float thickness, float r_fill, float g_fill, float b_fill, float a_fill, float r_stroke, float g_stroke, float b_stroke, float a_stroke, const void *object){
+    Plot *plot = (Plot *)object;
+    plot -> draw_solid_rect_with_border(x, y, thickness, r_fill, g_fill, b_fill, a_fill, r_stroke, g_stroke, b_stroke, a_stroke);
+  }
+
   void draw_solid_circle(float cx, float cy, float radius, float r, float g, float b, float a, const void *object){
     Plot *plot = (Plot *)object;
     plot -> draw_solid_circle(cx, cy, radius, r, g, b, a);

Sources/AGGRenderer/CPPAGGRenderer/include/CPPAGGRenderer.h

@@ -10,6 +10,8 @@ namespace CPPAGGRenderer{
 
   void draw_solid_rect(const float *x, const float *y, float r, float g, float b, float a, int hatch_pattern, const void *object);
 
+  void draw_solid_rect_with_border(const float *x, const float *y, float thickness, float r_fill, float g_fill, float b_fill, float a_fill, float r_stroke, float g_stroke, float b_stroke, float a_stroke, const void *object);
+
   void draw_solid_circle(float cx, float cy, float radius, 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);

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

Sources/SwiftPlot/Renderer.swift

@@ -111,7 +111,8 @@ public protocol Renderer: AnyObject{
     *             This is decided by the boolean parameter isOriginShifted.
     */
     func drawSolidRectWithBorder(_ rect: Rect,
-                                 strokeWidth thickness: Float, fillColor: Color,
+                                 strokeWidth thickness: Float,
+                                 fillColor: Color,
                                  borderColor: Color)
 
     /*drawSolidCircle()
@@ -172,7 +173,7 @@ public protocol Renderer: AnyObject{
 }
 
 extension Renderer {
-    
+
     public var xOffset: Float {
         get { return offset.x }
         set { offset.x = newValue}
@@ -184,7 +185,7 @@ extension Renderer {
     func getTextWidth(text: String, textSize size: Float) -> Float {
         return getTextLayoutSize(text: text, textSize: size).width
     }
-    
+
     public func withAdditionalOffset(_ offset: Point, _ perform: (Self) throws -> Void) rethrows {
         let oldOffset = (self.xOffset, self.yOffset)
         self.xOffset += offset.x