Consider axis dependency in Combined chart

https://github.com/danielgindi/Charts/pull/2874

1 files changed, 21 insertions, 12 deletions

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.java
index 39625b30..0b36aa3b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.java
@@ -3,6 +3,7 @@ package com.github.mikephil.charting.data;
 
 import android.util.Log;
 
+import com.github.mikephil.charting.components.YAxis;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet;
 
@@ -91,18 +92,26 @@ public class CombinedData extends BarLineScatterCandleBubbleData<IBarLineScatter
             if (data.getXMin() < mXMin)
                 mXMin = data.getXMin();
 
-            if (data.mLeftAxisMax > mLeftAxisMax)
-                mLeftAxisMax = data.mLeftAxisMax;
-
-            if (data.mLeftAxisMin < mLeftAxisMin)
-                mLeftAxisMin = data.mLeftAxisMin;
-
-            if (data.mRightAxisMax > mRightAxisMax)
-                mRightAxisMax = data.mRightAxisMax;
-
-            if (data.mRightAxisMin < mRightAxisMin)
-                mRightAxisMin = data.mRightAxisMin;
-
+            for (IBarLineScatterCandleBubbleDataSet<? extends Entry> dataset : sets) {
+                if (dataset.getAxisDependency() == YAxis.AxisDependency.LEFT)  {
+                    if (dataset.getYMax() > mLeftAxisMax) {
+                        mLeftAxisMax = dataset.getYMax();
+                    }
+
+                    if (dataset.getYMin() < mLeftAxisMin) {
+                        mLeftAxisMin = dataset.getYMin();
+                    }
+                }
+                else {
+                    if (dataset.getYMax() > mRightAxisMax) {
+                        mRightAxisMax = dataset.getYMax();
+                    }
+
+                    if (dataset.getYMin() < mRightAxisMin) {
+                        mRightAxisMin = dataset.getYMin();
+                    }
+                }
+            }
         }
     }