Merge branch 'liuxuan30-radar+negative_value'

ChartsOrg · Aug 12, 2015 · 2068a5c · 2068a5c
2 parents 78e5df8 + 4b0ea28
commit 2068a5c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -332,9 +332,9 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
                 // If the values are all negative, let's stay in the negative zone
                 _leftAxis.axisMaximum = 0.0
             }
-            else
+            else if _leftAxis.axisMinimum >= 0.0
             {
-                // We have positive values, stay in the positive zone
+                // We have positive values only, stay in the positive zone
                 _leftAxis.axisMinimum = 0.0
             }
         }
@@ -346,9 +346,9 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
                 // If the values are all negative, let's stay in the negative zone
                 _rightAxis.axisMaximum = 0.0
             }
-            else
+            else if _rightAxis.axisMinimum >= 0.0
             {
-                // We have positive values, stay in the positive zone
+                // We have positive values only, stay in the positive zone
                 _rightAxis.axisMinimum = 0.0
             }
         }

diff --git a/Charts/Classes/Charts/RadarChartView.swift b/Charts/Classes/Charts/RadarChartView.swift
@@ -94,7 +94,7 @@ public class RadarChartView: PieRadarChartViewBase
         // consider starting at zero (0)
         if (_yAxis.isStartAtZeroEnabled)
         {
-            _yAxis.axisMinimum = 0.0
+            _yAxis.axisMinimum = min(0.0, _yAxis.axisMinimum)
         }
 
         _yAxis.axisRange = abs(_yAxis.axisMaximum - _yAxis.axisMinimum)

diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -102,7 +102,9 @@ public class ChartYAxisRenderer: ChartAxisRendererBase
                 v += step
             }
 
-        } else {
+        }
+        else
+        {
             // no forced count
 
             // if the labels should only show min and max

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererRadarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererRadarChart.swift
@@ -78,7 +78,9 @@ public class ChartYAxisRendererRadarChart: ChartYAxisRenderer
                 v += step
             }
 
-        } else {
+        }
+        else
+        {
             // no forced count
 
             // clean old values
@@ -96,7 +98,13 @@ public class ChartYAxisRendererRadarChart: ChartYAxisRenderer
             }
             else
             {
-                var first = ceil(Double(yMin) / interval) * interval
+                let rawCount = Double(yMin) / interval
+                var first = rawCount < 0.0 ? floor(rawCount) * interval : ceil(rawCount) * interval;
+
+                if (first < yMin && _yAxis.isStartAtZeroEnabled)
+                { // Force the first label to be at the 0 (or smallest negative value)
+                    first = yMin
+                }
 
                 if (first == 0.0)
                 { // Fix for IEEE negative zero case (Where value == -0.0, and 0.0 == -0.0)
@@ -131,6 +139,12 @@ public class ChartYAxisRendererRadarChart: ChartYAxisRenderer
             }
         }
 
+        if !_yAxis.isStartAtZeroEnabled && _yAxis.entries[0] < yMin
+        {
+            // If startAtZero is disabled, and the first label is lower that the axis minimum,
+            // Then adjust the axis minimum
+            _yAxis.axisMinimum = _yAxis.entries[0]
+        }
         _yAxis.axisMaximum = _yAxis.entries[_yAxis.entryCount - 1]
         _yAxis.axisRange = abs(_yAxis.axisMaximum - _yAxis.axisMinimum)
     }