Prevent endless loop caused by skipWebLineCount (Fixes #424, #425)

ChartsOrg · Oct 1, 2015 · 088b10d · 088b10d
1 parent c276177
commit 088b10d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Charts/Classes/Charts/RadarChartView.swift b/Charts/Classes/Charts/RadarChartView.swift
@@ -38,7 +38,7 @@ public class RadarChartView: PieRadarChartViewBase
     public var drawWeb = true
 
     /// modulus that determines how many labels and web-lines are skipped before the next is drawn
-    private var _webModulus = 1
+    private var _skipWebLineCount = 1
 
     /// the object reprsenting the y-axis labels
     private var _yAxis: ChartYAxis!
@@ -248,11 +248,11 @@ public class RadarChartView: PieRadarChartViewBase
     {
         get
         {
-            return _webModulus - 1
+            return _skipWebLineCount
         }
         set
         {
-            _webModulus = max(0, newValue) + 1
+            _skipWebLineCount = max(0, newValue)
         }
     }
 

diff --git a/Charts/Classes/Renderers/RadarChartRenderer.swift b/Charts/Classes/Renderers/RadarChartRenderer.swift
@@ -185,8 +185,9 @@ public class RadarChartRenderer: LineScatterCandleRadarChartRenderer
         CGContextSetStrokeColorWithColor(context, _chart.webColor.CGColor)
         CGContextSetAlpha(context, _chart.webAlpha)
 
-        let modulus = _chart.skipWebLineCount
-        for var i = 0, xValCount = _chart.data!.xValCount; i < xValCount; i += modulus
+        let xIncrements = 1 + _chart.skipWebLineCount
+
+        for var i = 0, xValCount = _chart.data!.xValCount; i < xValCount; i += xIncrements
         {
             let p = ChartUtils.getPosition(center: center, dist: CGFloat(_chart.yRange) * factor, angle: sliceangle * CGFloat(i) + rotationangle)