Stop axis labels duplicating.

ChartsOrg · Jan 4, 2016 · bb0527f · bb0527f
1 parent 65e3ae9
commit bb0527f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/Charts/Classes/Components/ChartYAxis.swift b/Charts/Classes/Components/ChartYAxis.swift
@@ -103,6 +103,14 @@ public class ChartYAxis: ChartAxisBase
     /// **default**: 0.0 (no maximum specified)
     public var maxWidth = CGFloat(0)
 
+    /// if true, axis values will be repeated
+    public var allowRepeatedValues = false
+
+    /// the minimum diference value of the axis values
+    ///
+    /// **default**: 1
+    public var granuality = Double(1.0)
+
     public override init()
     {
         super.init()

diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -70,6 +70,10 @@ public class ChartYAxisRenderer: ChartAxisRendererBase
 
         let rawInterval = range / Double(labelCount)
         var interval = ChartUtils.roundToNextSignificant(number: Double(rawInterval))
+        if !_yAxis.allowRepeatedValues
+        {
+            interval = interval < _yAxis.granuality ? _yAxis.granuality : interval
+        }
         let intervalMagnitude = pow(10.0, round(log10(interval)))
         let intervalSigDigit = (interval / intervalMagnitude)
         if (intervalSigDigit > 5)

diff --git a/ChartsDemo/Classes/Demos/CombinedChartViewController.m b/ChartsDemo/Classes/Demos/CombinedChartViewController.m
@@ -54,9 +54,11 @@ - (void)viewDidLoad
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.drawGridLinesEnabled = NO;
+    rightAxis.granuality = 0.1;
 
     ChartYAxis *leftAxis = _chartView.leftAxis;
     leftAxis.drawGridLinesEnabled = NO;
+    leftAxis.granuality = 0.1;
 
     ChartXAxis *xAxis = _chartView.xAxis;
     xAxis.labelPosition = XAxisLabelPositionBothSided;

diff --git a/ChartsDemo/Classes/Demos/LineChart2ViewController.m b/ChartsDemo/Classes/Demos/LineChart2ViewController.m
@@ -75,13 +75,15 @@ - (void)viewDidLoad
     leftAxis.labelTextColor = [UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f];
     leftAxis.customAxisMax = 200.0;
     leftAxis.drawGridLinesEnabled = YES;
+    leftAxis.allowRepeatedValues = NO;
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.labelTextColor = UIColor.redColor;
     rightAxis.customAxisMax = 900.0;
     rightAxis.startAtZeroEnabled = NO;
     rightAxis.customAxisMin = -200.0;
     rightAxis.drawGridLinesEnabled = NO;
+    rightAxis.allowRepeatedValues = YES;
 
     _sliderX.value = 19.0;
     _sliderY.value = 30.0;