Allow disabling tap-highlight while still being able to highlight programatically or via drag.

PhilJay · PhilJay · commit 5cbc6b7245d6 · 2015-10-16T12:05:49.000+02:00
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java
@@ -370,8 +370,9 @@ public void onChartGestureStart(MotionEvent me, ChartTouchListener.ChartGesture
     public void onChartGestureEnd(MotionEvent me, ChartTouchListener.ChartGesture lastPerformedGesture) {
         Log.i("Gesture", "END, lastGesture: " + lastPerformedGesture);
 
+        // un-highlight values after the gesture is finished and no single-tap
         if(lastPerformedGesture != ChartTouchListener.ChartGesture.SINGLE_TAP)
-            mChart.highlightValues(null);
+            mChart.highlightValues(null); // or highlightTouch(null) for callback to onNothingSelected(...)
     }
 
     @Override
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java
@@ -85,6 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setRotationAngle(0);
         // enable rotation of the chart by touch
         mChart.setRotationEnabled(true);
+        mChart.setHighLightPerTapEnabled(false);
 
         // mChart.setUnit(" €");
         // mChart.setDrawUnitsInChart(true);
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
@@ -76,6 +76,11 @@ public abstract class Chart<T extends ChartData<? extends DataSet<? extends Entr
      */
     protected T mData = null;
 
+    /**
+     * Flag that indicates if highlighting per tap (touch) is enabled
+     */
+    protected boolean mHighLightPerTapEnabled = true;
+
     /**
      * If set to true, chart continues to scroll after touch up
      */
@@ -495,6 +500,14 @@ public Highlight[] getHighlighted() {
         return mIndicesToHighlight;
     }
 
+    public boolean isHighLightPerTapEnabled() {
+        return mHighLightPerTapEnabled;
+    }
+
+    public void setHighLightPerTapEnabled(boolean enabled) {
+        mHighLightPerTapEnabled = enabled;
+    }
+
     /**
      * Returns true if there are values to highlight, false if there are no
      * values to highlight. Checks if the highlight array is null, has a length
diff --git a/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
@@ -542,8 +542,6 @@ public void onLongPress(MotionEvent e) {
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
 
-        performHighlight(e);
-
         mLastGesture = ChartGesture.SINGLE_TAP;
 
         OnChartGestureListener l = mChart.getOnChartGestureListener();
@@ -552,6 +550,12 @@ public boolean onSingleTapUp(MotionEvent e) {
             l.onChartSingleTapped(e);
         }
 
+        if(!mChart.isHighLightPerTapEnabled()) {
+            return false;
+        }
+
+        performHighlight(e);
+
         return super.onSingleTapUp(e);
     }
 
diff --git a/MPChartLib/src/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java b/MPChartLib/src/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java
@@ -147,6 +147,10 @@ public boolean onSingleTapUp(MotionEvent e) {
             l.onChartSingleTapped(e);
         }
 
+        if(!mChart.isHighLightPerTapEnabled()) {
+            return false;
+        }
+
         float distance = mChart.distanceToCenter(e.getX(), e.getY());
 
         // check if a slice was touched

Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,9 @@ public void onChartGestureStart(MotionEvent me, ChartTouchListener.ChartGesture`
`370`	`370`	`public void onChartGestureEnd(MotionEvent me, ChartTouchListener.ChartGesture lastPerformedGesture) {`
`371`	`371`	`Log.i("Gesture", "END, lastGesture: " + lastPerformedGesture);`
`372`	`372`
	`373`	`+ // un-highlight values after the gesture is finished and no single-tap`
`373`	`374`	`if(lastPerformedGesture != ChartTouchListener.ChartGesture.SINGLE_TAP)`
`374`		`- mChart.highlightValues(null);`
	`375`	`+ mChart.highlightValues(null); // or highlightTouch(null) for callback to onNothingSelected(...)`
`375`	`376`	`}`
`376`	`377`
`377`	`378`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,10 @@ public boolean onSingleTapUp(MotionEvent e) {`
`147`	`147`	`l.onChartSingleTapped(e);`
`148`	`148`	`}`
`149`	`149`
	`150`	`+ if(!mChart.isHighLightPerTapEnabled()) {`
	`151`	`+ return false;`
	`152`	`+ }`
	`153`	`+`
`150`	`154`	`float distance = mChart.distanceToCenter(e.getX(), e.getY());`
`151`	`155`
`152`	`156`	`// check if a slice was touched`