fix ChartsOrg#1488, ChartsOrg#1564

1. use axis.centerAxisLabelsEnabled instead of local variable to avoid dirty read 2. fix xAxis label missing issue
liuxuan30 · Sep 27, 2016 · 67ad1ba · 67ad1ba
1 parent 3a2da1b
commit 67ad1ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Source/Charts/Components/AxisBase.swift b/Source/Charts/Components/AxisBase.swift
@@ -50,7 +50,7 @@ open class AxisBase: ComponentBase
     /// This is useful especially for grouped BarChart.
     open var centerAxisLabelsEnabled: Bool
     {
-        get { return _centerAxisLabelsEnabled && entryCount > 1 }
+        get { return _centerAxisLabelsEnabled && entryCount > 0 }
         set { _centerAxisLabelsEnabled = newValue }
     }
 

diff --git a/Source/Charts/Renderers/AxisRendererBase.swift b/Source/Charts/Renderers/AxisRendererBase.swift
@@ -129,9 +129,8 @@ open class AxisRendererBase: Renderer
             // Use one order of magnitude higher, to avoid intervals like 0.9 or 90
             interval = floor(10.0 * Double(intervalMagnitude))
         }
-
-        let centeringEnabled = axis.centerAxisLabelsEnabled
-        var n = centeringEnabled ? 1 : 0
+
+        var n = axis.centerAxisLabelsEnabled ? 1 : 0
 
         // force label count
         if axis.isForceLabelsEnabled
@@ -158,7 +157,7 @@ open class AxisRendererBase: Renderer
 
             var first = interval == 0.0 ? 0.0 : ceil(yMin / interval) * interval
 
-            if centeringEnabled
+            if axis.centerAxisLabelsEnabled
             {
                 first -= interval
             }
@@ -204,16 +203,12 @@ open class AxisRendererBase: Renderer
             axis.decimals = 0
         }
 
-        if centeringEnabled
+        if axis.centerAxisLabelsEnabled
         {
             axis.centeredEntries.reserveCapacity(n)
             axis.centeredEntries.removeAll()
 
-            var offset: Double = 0.0
-            if axis.entries.count > 1
-            {
-                offset = (axis.entries[1] - axis.entries[0]) / 2.0
-            }
+            let offset: Double = interval / 2.0
 
             for i in 0 ..< n
             {