fix #1830. credit from #2049

ChartsOrg · Dec 23, 2017 · 6c441a9 · 6c441a9
1 parent 5639818
commit 6c441a9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/ChartsDemo/Objective-C/Demos/CombinedChartViewController.m b/ChartsDemo/Objective-C/Demos/CombinedChartViewController.m
@@ -206,7 +206,7 @@ - (BarChartData *)generateBarData
     [set1 setColor:[UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f]];
     set1.valueTextColor = [UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f];
     set1.valueFont = [UIFont systemFontOfSize:10.f];
-    set1.axisDependency = AxisDependencyLeft;
+    set1.axisDependency = AxisDependencyRight;
 
     BarChartDataSet *set2 = [[BarChartDataSet alloc] initWithValues:entries2 label:@""];
     set2.stackLabels = @[@"Stack 1", @"Stack 2"];
@@ -216,7 +216,7 @@ - (BarChartData *)generateBarData
                     ];
     set2.valueTextColor = [UIColor colorWithRed:61/255.f green:165/255.f blue:255/255.f alpha:1.f];
     set2.valueFont = [UIFont systemFontOfSize:10.f];
-    set2.axisDependency = AxisDependencyLeft;
+    set2.axisDependency = AxisDependencyRight;
 
     float groupSpace = 0.06f;
     float barSpace = 0.02f; // x2 dataset

diff --git a/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift b/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift
@@ -136,25 +136,32 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
             {
                 _xMin = data.xMin
             }
-
-            if data.yMax > _leftAxisMax
-            {
-                _leftAxisMax = data.yMax
-            }
-
-            if data.yMin < _leftAxisMin
-            {
-                _leftAxisMin = data.yMin
-            }
-
-            if data.yMax > _rightAxisMax
-            {
-                _rightAxisMax = data.yMax
-            }
-
-            if data.yMin < _rightAxisMin
+
+            for i in 0 ..< sets.count
             {
-                _rightAxisMin = data.yMin
+                let dataset = sets[i]
+                if dataset.axisDependency == .left
+                {
+                    if dataset.yMax > _leftAxisMax
+                    {
+                        _leftAxisMax = dataset.yMax
+                    }
+                    if dataset.yMin < _leftAxisMin
+                    {
+                        _leftAxisMin = dataset.yMin
+                    }
+                }
+                else
+                {
+                    if dataset.yMax > _rightAxisMax
+                    {
+                        _rightAxisMax = dataset.yMax
+                    }
+                    if dataset.yMin < _rightAxisMin
+                    {
+                        _rightAxisMin = dataset.yMin
+                    }
+                }
             }
         }
     }