Work on highlighting

PhilJay · PhilJay · commit c28b41b05ed9 · 2016-06-10T23:35:29.000+02:00
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java
@@ -36,6 +36,7 @@
 import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class CombinedChartActivity extends DemoBase {
 
@@ -137,7 +138,9 @@ private BarData generateBarData() {
 
         for (int index = 0; index < itemcount; index++) {
             entries1.add(new BarEntry(0, getRandom(25, 25)));
-            entries2.add(new BarEntry(0, getRandom(25, 25)));
+
+            // stacked
+            entries2.add(new BarEntry(0, new float[]{getRandom(13, 12), getRandom(13, 12)}));
         }
 
         BarDataSet set1 = new BarDataSet(entries1, "Bar 1");
@@ -147,7 +150,7 @@ private BarData generateBarData() {
         set1.setAxisDependency(YAxis.AxisDependency.LEFT);
 
         BarDataSet set2 = new BarDataSet(entries2, "Bar 2");
-        set2.setColor(Color.rgb(61, 165, 255));
+        set2.setColors(new int[]{Color.rgb(61, 165, 255), Color.rgb(23, 197, 255)});
         set2.setValueTextColor(Color.rgb(61, 165, 255));
         set2.setValueTextSize(10f);
         set2.setAxisDependency(YAxis.AxisDependency.LEFT);
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java
@@ -187,7 +187,6 @@ public BarData getBarData() {
         return mData;
     }
 
-
     /**
      * Adds half of the bar width to each side of the x-axis range in order to allow the bars of the barchart to be
      * fully displayed.
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
@@ -37,6 +37,7 @@
 import com.github.mikephil.charting.formatter.ValueFormatter;
 import com.github.mikephil.charting.highlight.ChartHighlighter;
 import com.github.mikephil.charting.highlight.Highlight;
+import com.github.mikephil.charting.highlight.Highlighter;
 import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface;
 import com.github.mikephil.charting.interfaces.datasets.IDataSet;
 import com.github.mikephil.charting.listener.ChartTouchListener;
@@ -162,7 +163,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      */
     protected DataRenderer mRenderer;
 
-    protected ChartHighlighter mHighlighter;
+    protected Highlighter mHighlighter;
 
     /**
      * object that manages the bounds and drawing constraints of the chart
@@ -1446,7 +1447,7 @@ public void setRenderer(DataRenderer renderer) {
             mRenderer = renderer;
     }
 
-    public ChartHighlighter getHighlighter() {
+    public Highlighter getHighlighter() {
         return mHighlighter;
     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
@@ -73,7 +73,7 @@ public CombinedChart(Context context, AttributeSet attrs, int defStyle) {
     protected void init() {
         super.init();
 
-        setHighlighter(new CombinedHighlighter(this));
+        setHighlighter(new CombinedHighlighter(this, this));
 
         // Old default behaviour
         setHighlightFullBarEnabled(true);
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.java
@@ -14,7 +14,7 @@
 /**
  * Created by Philipp Jahoda on 21/07/15.
  */
-public class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider> {
+public class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider> implements Highlighter {
 
     /**
      * instance of the data-provider
@@ -25,13 +25,7 @@ public ChartHighlighter(T chart) {
         this.mChart = chart;
     }
 
-    /**
-     * Returns a Highlight object corresponding to the given x- and y- touch positions in pixels.
-     *
-     * @param x
-     * @param y
-     * @return
-     */
+    @Override
     public Highlight getHighlight(float x, float y) {
 
         float xVal = (float) getValsForTouch(x, y).x;
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.java
@@ -3,6 +3,7 @@
 import com.github.mikephil.charting.data.ChartData;
 import com.github.mikephil.charting.data.CombinedData;
 import com.github.mikephil.charting.data.DataSet;
+import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider;
 import com.github.mikephil.charting.interfaces.datasets.IDataSet;
 import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider;
 import com.github.mikephil.charting.utils.SelectionDetail;
@@ -13,10 +14,22 @@
 /**
  * Created by Philipp Jahoda on 12/09/15.
  */
-public class CombinedHighlighter extends ChartHighlighter<BarLineScatterCandleBubbleDataProvider> {
+public class CombinedHighlighter extends ChartHighlighter<BarLineScatterCandleBubbleDataProvider> implements Highlighter {
 
-    public CombinedHighlighter(BarLineScatterCandleBubbleDataProvider chart) {
+    protected BarHighlighter barHighlighter;
+
+    public CombinedHighlighter(BarLineScatterCandleBubbleDataProvider chart, BarDataProvider barChart) {
         super(chart);
+        barHighlighter = new BarHighlighter(barChart);
+    }
+
+    @Override
+    public Highlight getHighlight(float x, float y) {
+
+        Highlight h1 = super.getHighlight(x, y);
+        Highlight h2 = barHighlighter.getHighlight(x, y);
+
+        return h1;
     }
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlighter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlighter.java
@@ -0,0 +1,16 @@
+package com.github.mikephil.charting.highlight;
+
+/**
+ * Created by philipp on 10/06/16.
+ */
+public interface Highlighter {
+
+    /**
+     * Returns a Highlight object corresponding to the given x- and y- touch positions in pixels.
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    Highlight getHighlight(float x, float y);
+}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,6 @@ public BarData getBarData() {`
`187`	`187`	`return mData;`
`188`	`188`	`}`
`189`	`189`
`190`		`-`
`191`	`190`	`/**`
`192`	`191`	`* Adds half of the bar width to each side of the x-axis range in order to allow the bars of the barchart to be`
`193`	`192`	`* fully displayed.`