Added dataIndex param for highlightValue (combined charts)

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

2 files changed, 63 insertions, 5 deletions

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
index 5d3401c4..b104935d 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
@@ -569,9 +569,34 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      * This method will call the listener.
      * @param x The x-value to highlight
      * @param dataSetIndex The dataset index to search in
+     * @param dataIndex The data index to search in (only used in CombinedChartView currently)
+     */
+    public void highlightValue(float x, int dataSetIndex, int dataIndex) {
+        highlightValue(x, dataSetIndex, dataIndex, true);
+    }
+
+    /**
+     * Highlights any y-value at the given x-value in the given DataSet.
+     * Provide -1 as the dataSetIndex to undo all highlighting.
+     * This method will call the listener.
+     * @param x The x-value to highlight
+     * @param dataSetIndex The dataset index to search in
      */
     public void highlightValue(float x, int dataSetIndex) {
-        highlightValue(x, dataSetIndex, true);
+        highlightValue(x, dataSetIndex, -1, true);
+    }
+
+    /**
+     * Highlights the value at the given x-value and y-value in the given DataSet.
+     * Provide -1 as the dataSetIndex to undo all highlighting.
+     * This method will call the listener.
+     * @param x The x-value to highlight
+     * @param y The y-value to highlight. Supply `NaN` for "any"
+     * @param dataSetIndex The dataset index to search in
+     * @param dataIndex The data index to search in (only used in CombinedChartView currently)
+     */
+    public void highlightValue(float x, float y, int dataSetIndex, int dataIndex) {
+        highlightValue(x, y, dataSetIndex, dataIndex, true);
     }
 
     /**
@@ -583,7 +608,19 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      * @param dataSetIndex The dataset index to search in
      */
     public void highlightValue(float x, float y, int dataSetIndex) {
-        highlightValue(x, y, dataSetIndex, true);
+        highlightValue(x, y, dataSetIndex, -1, true);
+    }
+
+    /**
+     * Highlights any y-value at the given x-value in the given DataSet.
+     * Provide -1 as the dataSetIndex to undo all highlighting.
+     * @param x The x-value to highlight
+     * @param dataSetIndex The dataset index to search in
+     * @param dataIndex The data index to search in (only used in CombinedChartView currently)
+     * @param callListener Should the listener be called for this change
+     */
+    public void highlightValue(float x, int dataSetIndex, int dataIndex, boolean callListener) {
+        highlightValue(x, Float.NaN, dataSetIndex, dataIndex, callListener);
     }
 
     /**
@@ -594,7 +631,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      * @param callListener Should the listener be called for this change
      */
     public void highlightValue(float x, int dataSetIndex, boolean callListener) {
-        highlightValue(x, Float.NaN, dataSetIndex, callListener);
+        highlightValue(x, Float.NaN, dataSetIndex, -1, callListener);
     }
 
     /**
@@ -603,18 +640,31 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      * @param x The x-value to highlight
      * @param y The y-value to highlight. Supply `NaN` for "any"
      * @param dataSetIndex The dataset index to search in
+     * @param dataIndex The data index to search in (only used in CombinedChartView currently)
      * @param callListener Should the listener be called for this change
      */
-    public void highlightValue(float x, float y, int dataSetIndex, boolean callListener) {
+    public void highlightValue(float x, float y, int dataSetIndex, int dataIndex, boolean callListener) {
 
         if (dataSetIndex < 0 || dataSetIndex >= mData.getDataSetCount()) {
             highlightValue(null, callListener);
         } else {
-            highlightValue(new Highlight(x, y, dataSetIndex), callListener);
+            highlightValue(new Highlight(x, y, dataSetIndex, dataIndex), callListener);
         }
     }
 
     /**
+     * Highlights any y-value at the given x-value in the given DataSet.
+     * Provide -1 as the dataSetIndex to undo all highlighting.
+     * @param x The x-value to highlight
+     * @param y The y-value to highlight. Supply `NaN` for "any"
+     * @param dataSetIndex The dataset index to search in
+     * @param callListener Should the listener be called for this change
+     */
+    public void highlightValue(float x, float y, int dataSetIndex, boolean callListener) {
+        highlightValue(x, y, dataSetIndex, -1, callListener);
+    }
+
+    /**
      * Highlights the values represented by the provided Highlight object
      * This method *will not* call the listener.
      *
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.java b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.java
index 032698d5..62307cbe 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.java
@@ -60,10 +60,18 @@ public class Highlight {
      */
     private float mDrawY;
 
+    public Highlight(float x, float y, int dataSetIndex, int dataIndex) {
+        this.mX = x;
+        this.mY = y;
+        this.mDataSetIndex = dataSetIndex;
+        this.mDataIndex = dataIndex;
+    }
+
     public Highlight(float x, float y, int dataSetIndex) {
         this.mX = x;
         this.mY = y;
         this.mDataSetIndex = dataSetIndex;
+        this.mDataIndex = -1;
     }
 
     public Highlight(float x, int dataSetIndex, int stackIndex) {