Merge pull request #934 from olbartek/master

Property circleHoleRadius added to ILineChartDataSet protocol.
ChartsOrg · May 22, 2016 · 82ab54b · 82ab54b
2 parents 0549e99 + d42c59b
commit 82ab54b
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/Charts/Classes/Data/Implementations/Standard/LineChartDataSet.swift b/Charts/Classes/Data/Implementations/Standard/LineChartDataSet.swift
@@ -113,6 +113,24 @@ public class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     /// The radius of the drawn circles.
     public var circleRadius = CGFloat(8.0)
 
+    private var _circleHoleRadius = CGFloat(4.0)
+
+    /// The hole radius of the drawn circles (new value is set only if it is less than circleRadius value)
+    public var circleHoleRadius : CGFloat
+    {
+        get
+        {
+            return _circleHoleRadius;
+        }
+        set
+        {
+            if newValue < self.circleRadius
+            {
+                _circleHoleRadius = newValue
+            }
+        }
+    }
+
     public var circleColors = [NSUIColor]()
 
     /// - returns: the color at the given index of the DataSet's circle-color array.

diff --git a/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift b/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
@@ -47,6 +47,9 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     /// The radius of the drawn circles.
     var circleRadius: CGFloat { get set }
 
+    /// The hole radius of the drawn circles.
+    var circleHoleRadius: CGFloat { get set }
+
     var circleColors: [NSUIColor] { get set }
 
     /// - returns: the color at the given index of the DataSet's circle-color array.

diff --git a/Charts/Classes/Renderers/LineChartRenderer.swift b/Charts/Classes/Renderers/LineChartRenderer.swift
@@ -650,8 +650,8 @@ public class LineChartRenderer: LineRadarChartRenderer
 
             let circleRadius = dataSet.circleRadius
             let circleDiameter = circleRadius * 2.0
-            let circleHoleDiameter = circleRadius
-            let circleHoleRadius = circleHoleDiameter / 2.0
+            let circleHoleRadius = dataSet.circleHoleRadius
+            let circleHoleDiameter = circleHoleRadius * 2.0
             let isDrawCircleHoleEnabled = dataSet.isDrawCircleHoleEnabled
 
             guard let

diff --git a/ChartsRealm/Classes/Data/RealmLineDataSet.swift b/ChartsRealm/Classes/Data/RealmLineDataSet.swift
@@ -94,6 +94,24 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet
     /// The radius of the drawn circles.
     public var circleRadius = CGFloat(8.0)
 
+    private var _circleHoleRadius = CGFloat(4.0)
+
+    /// The hole radius of the drawn circles (new value is set only if it is less than circleRadius value)
+    public var circleHoleRadius : CGFloat
+    {
+        get
+        {
+            return _circleHoleRadius;
+        }
+        set
+        {
+            if newValue < self.circleRadius
+            {
+                _circleHoleRadius = newValue
+            }
+        }
+    }
+
     public var circleColors = [NSUIColor]()
 
     /// - returns: the color at the given index of the DataSet's circle-color array.