Add logic to make cornerRadius on BarChart

ChartsOrg · Mar 28, 2024 · c14ed45 · c14ed45
1 parent 29e4f58
commit c14ed45
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift
@@ -51,6 +51,12 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, BarChartData
     /// the overall entry count, including counting each stack-value individually
     private var _entryCountStacks = 0
 
+    /// the corner radius applied to each data set
+    public var cornerRadius: CGFloat = 0.0
+
+    /// array of corners to be rounded
+    open var roundedCorners: UIRectCorner = []
+
     /// Calculates the total number of entries this DataSet represents, including
     /// stacks. All values belonging to a stack are calculated separately.
     private func calcEntryCountIncludingStacks(entries: [BarChartDataEntry])

diff --git a/Source/Charts/Data/Interfaces/BarChartDataSetProtocol.swift b/Source/Charts/Data/Interfaces/BarChartDataSetProtocol.swift
@@ -12,6 +12,10 @@
 import Foundation
 import CoreGraphics
 
+#if canImport(UIKit)
+import UIKit
+#endif
+
 @objc
 public protocol BarChartDataSetProtocol: BarLineScatterCandleBubbleChartDataSetProtocol
 {
@@ -39,4 +43,10 @@ public protocol BarChartDataSetProtocol: BarLineScatterCandleBubbleChartDataSetP
 
     /// array of labels used to describe the different values of the stacked bars
     var stackLabels: [String] { get set }
+
+    /// the corner radius applied to each data set
+    var cornerRadius: CGFloat { get set }
+
+    /// array of corners to be rounded
+    var roundedCorners: UIRectCorner { get set }
 }
diff --git a/Source/Charts/Renderers/BarChartRenderer.swift b/Source/Charts/Renderers/BarChartRenderer.swift
@@ -351,7 +351,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 guard viewPortHandler.isInBoundsRight(barRect.origin.x) else { break }
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
-                context.fill(barRect)
+
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+                                              cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
 
@@ -379,7 +383,10 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            context.fill(barRect)
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+                                          cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+            context.addPath(bezierPath.cgPath)
+            context.drawPath(using: .fill)
 
             if drawBorder
             {
@@ -744,7 +751,10 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
 
                 setHighlightDrawPos(highlight: high, barRect: barRect)
 
-                context.fill(barRect)
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: set.roundedCorners,
+                                              cornerRadii: .init(width: set.cornerRadius, height: set.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
     }

diff --git a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
@@ -228,7 +228,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 _barShadowRectBuffer.size.width = viewPortHandler.contentWidth
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
-                context.fill(_barShadowRectBuffer)
+
+                let bezierPath = UIBezierPath(roundedRect: _barShadowRectBuffer, byRoundingCorners: dataSet.roundedCorners,
+                                              cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
 
@@ -265,7 +269,10 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            context.fill(barRect)
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+                                          cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+            context.addPath(bezierPath.cgPath)
+            context.drawPath(using: .fill)
 
             if drawBorder
             {