Merge pull request #2377 from liuxuan30/Issue2356

fix #2356 crash if floor(10.0 * intervalMagnitude) is 0.0
ChartsOrg · Jan 15, 2018 · 43ccf8e · 43ccf8e
2 parents ba40ab4 + 5092512
commit 43ccf8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Source/Charts/Renderers/AxisRendererBase.swift b/Source/Charts/Renderers/AxisRendererBase.swift
@@ -119,7 +119,8 @@ open class AxisRendererBase: Renderer
         if intervalSigDigit > 5
         {
             // Use one order of magnitude higher, to avoid intervals like 0.9 or 90
-            interval = floor(10.0 * Double(intervalMagnitude))
+            // if it's 0.0 after floor(), we use the old value
+            interval = floor(10.0 * intervalMagnitude) == 0.0 ? interval : floor(10.0 * intervalMagnitude)
         }
 
         var n = axis.centerAxisLabelsEnabled ? 1 : 0

diff --git a/Source/Charts/Renderers/YAxisRendererRadarChart.swift b/Source/Charts/Renderers/YAxisRendererRadarChart.swift
@@ -60,9 +60,9 @@ open class YAxisRendererRadarChart: YAxisRenderer
 
         if intervalSigDigit > 5
         {
-            // Use one order of magnitude higher, to avoid intervals like 0.9 or
-            // 90
-            interval = floor(10 * intervalMagnitude)
+            // Use one order of magnitude higher, to avoid intervals like 0.9 or 90
+            // if it's 0.0 after floor(), we use the old value
+            interval = floor(10.0 * intervalMagnitude) == 0.0 ? interval : floor(10.0 * intervalMagnitude)
         }
 
         let centeringEnabled = axis.isCenterAxisLabelsEnabled