Allow to setHighlightEnabled on a single DataSet

ChartsOrg/Charts#114
danielgindi · Jun 2, 2015 · 4ec22d7 · 4ec22d7
1 parent f32cfd0
commit 4ec22d7
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 46 deletions.
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java
@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // enable/disable highlight indicators (the lines that indicate the
         // highlighted Entry)
-        mChart.setHighlightIndicatorEnabled(false);
+        mChart.setHighlightEnabled(false);
 
         XAxis xl = mChart.getXAxis();
         xl.setAvoidFirstLastClipping(true);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java
@@ -96,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // enable/disable highlight indicators (the lines that indicate the
         // highlighted Entry)
-        mChart.setHighlightIndicatorEnabled(false);
+        mChart.setHighlightEnabled(false);
 
         // x-axis limit line
 //        LimitLine llXAxis = new LimitLine(10f, "Index 10");

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PerformanceLineChart.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PerformanceLineChart.java
@@ -60,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // enable/disable highlight indicators (the lines that indicate the
         // highlighted Entry)
-        mChart.setHighlightIndicatorEnabled(false);
+        mChart.setHighlightEnabled(false);
 
         mChart.getAxisLeft().setDrawGridLines(false);
         mChart.getAxisRight().setEnabled(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/BarChartFrag.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/BarChartFrag.java
@@ -39,7 +39,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         mChart.setMarkerView(mv);
 
-        mChart.setHighlightIndicatorEnabled(false);
+        mChart.setHighlightEnabled(false);
 
         mChart.setDrawGridBackground(false);
         mChart.setDrawBarShadow(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java
@@ -29,7 +29,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         mChart.setDescription("");
 
-        mChart.setHighlightIndicatorEnabled(false); 
+        mChart.setHighlightEnabled(false);
         mChart.setDrawGridBackground(false);
 
         mChart.setData(getComplexity());

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ScatterChartFrag.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ScatterChartFrag.java
@@ -36,7 +36,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         mChart.setMarkerView(mv);
 
-        mChart.setHighlightIndicatorEnabled(false);
+        mChart.setHighlightEnabled(false);
         mChart.setDrawGridBackground(false);
         mChart.setData(generateScatterData(6, 10000, 200));
 

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SineCosineFragment.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SineCosineFragment.java
@@ -30,7 +30,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mChart.setDescription("");
 //        mChart.setCircleSize(5f);
 
-        mChart.setHighlightIndicatorEnabled(false); 
+        mChart.setHighlightEnabled(false);
         mChart.setDrawGridBackground(false);
 
         mChart.setData(generateLineData());

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -75,12 +75,6 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleData<? exte
      */
     protected boolean mHighlightPerDragEnabled = true;
 
-    /**
-     * if set to true, the highlight indicator (lines for linechart, dark bar
-     * for barchart) will be drawn upon selecting values.
-     */
-    protected boolean mHighLightIndicatorEnabled = true;
-
     /** if true, dragging is enabled for the chart */
     private boolean mDragEnabled = true;
 
@@ -244,7 +238,7 @@ protected void onDraw(Canvas canvas) {
             mAxisRendererRight.renderLimitLines(canvas);
 
         // if highlighting is enabled
-        if (mHighlightEnabled && mHighLightIndicatorEnabled && valuesToHighlight())
+        if (valuesToHighlight())
             mRenderer.drawHighlighted(canvas, mIndicesToHightlight);
 
         // Removes clipping rectangle
@@ -889,18 +883,6 @@ public int getMaxVisibleCount() {
         return mMaxVisibleCount;
     }
 
-    /**
-     * If set to true, the highlight indicator (vertical line for LineChart and
-     * ScatterChart, dark bar overlay for BarChart) that gives visual indication
-     * that an Entry has been selected will be drawn upon selecting values. This
-     * does not depend on the MarkerView. Default: true
-     * 
-     * @param enabled
-     */
-    public void setHighlightIndicatorEnabled(boolean enabled) {
-        mHighLightIndicatorEnabled = enabled;
-    }
-
     /**
      * Set this to true to allow highlighting per dragging over the chart
      * surface when it is fully zoomed out. Default: true

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
@@ -116,9 +116,6 @@ public abstract class Chart<T extends ChartData<? extends DataSet<? extends Entr
     /** if true, touch gestures are enabled on the chart */
     protected boolean mTouchEnabled = true;
 
-    /** if true, value highlightning is enabled */
-    protected boolean mHighlightEnabled = true;
-
     /** the legend object containing all data associated with the legend */
     protected Legend mLegend;
 
@@ -865,7 +862,8 @@ public OnChartGestureListener getOnChartGestureListener() {
      * @param enabled
      */
     public void setHighlightEnabled(boolean enabled) {
-        mHighlightEnabled = enabled;
+        if (mData != null)
+            mData.setHighlightEnabled(enabled);
     }
 
     /**
@@ -874,7 +872,7 @@ public void setHighlightEnabled(boolean enabled) {
      * @return
      */
     public boolean isHighlightEnabled() {
-        return mHighlightEnabled;
+        return mData == null ? true : mData.isHighlightEnabled();
     }
 
     /**

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java
@@ -102,7 +102,7 @@ protected void onDraw(Canvas canvas) {
 
         mRenderer.drawData(canvas);
 
-        if (mHighlightEnabled && valuesToHighlight())
+        if (valuesToHighlight())
             mRenderer.drawHighlighted(canvas, mIndicesToHightlight);
 
         mRenderer.drawExtras(canvas);

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/RadarChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/RadarChart.java
@@ -162,7 +162,7 @@ protected void onDraw(Canvas canvas) {
 
         mRenderer.drawData(canvas);
 
-        if (mHighlightEnabled && valuesToHighlight())
+        if (valuesToHighlight())
             mRenderer.drawHighlighted(canvas, mIndicesToHightlight);
 
         mYAxisRenderer.renderAxisLabels(canvas);

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java b/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java
@@ -900,6 +900,28 @@ public void setDrawValues(boolean enabled) {
         }
     }
 
+    /**
+     * Enables / disables highlighting values for all DataSets this data object contains.
+     */
+    public void setHighlightEnabled(boolean enabled) {
+        for (DataSet<?> set : mDataSets) {
+            set.setHighlightEnabled(enabled);
+        }
+    }
+
+    /**
+     * returns true if highlighting of values is enabled, false if not
+     *
+     * @return
+     */
+    public boolean isHighlightEnabled() {
+        for (DataSet<?> set : mDataSets) {
+            if (!set.isHighlightEnabled())
+                return false;
+        }
+        return true;
+    }
+
     /**
      * Clears this data object from all DataSets and removes all Entries. Don't
      * forget to invalidate the chart after this.

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/DataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/DataSet.java
@@ -69,6 +69,9 @@ public abstract class DataSet<T extends Entry> {
     /** this specifies which axis this DataSet should be plotted against */
     protected AxisDependency mAxisDependency = AxisDependency.LEFT;
 
+    /** if true, value highlightning is enabled */
+    protected boolean mHighlightEnabled = true;
+
     /**
      * Creates a new DataSet object with the given values it represents. Also, a
      * label that describes the DataSet can be specified. The label can also be
@@ -614,6 +617,25 @@ public void resetColors() {
         mColors = new ArrayList<Integer>();
     }
 
+    /**
+     * If set to true, value highlighting is enabled which means that values can
+     * be highlighted programmatically or by touch gesture.
+     *
+     * @param enabled
+     */
+    public void setHighlightEnabled(boolean enabled) {
+        mHighlightEnabled = enabled;
+    }
+
+    /**
+     * returns true if highlighting of values is enabled, false if not
+     *
+     * @return
+     */
+    public boolean isHighlightEnabled() {
+        return mHighlightEnabled;
+    }
+
     /**
      * Returns the position of the provided entry in the DataSets Entry array.
      * Returns -1 if doesn't exist.

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/BarChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/BarChartRenderer.java
@@ -324,7 +324,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             int dataSetIndex = h.getDataSetIndex();
             BarDataSet set = mChart.getBarData().getDataSetByIndex(dataSetIndex);
 
-            if (set == null)
+            if (set == null || !set.isHighlightEnabled())
                 continue;
 
             float barspaceHalf = set.getBarSpace() / 2f;

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/BubbleChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/BubbleChartRenderer.java
@@ -200,7 +200,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
 
             BubbleDataSet dataSet = bubbleData.getDataSetByIndex(indice.getDataSetIndex());
 
-            if (dataSet == null)
+            if (dataSet == null || !dataSet.isHighlightEnabled())
                 continue;
 
             Entry entryFrom = dataSet.getEntryForXIndex(mMinX);

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/CandleStickChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/CandleStickChartRenderer.java
@@ -265,7 +265,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             CandleDataSet set = mChart.getCandleData().getDataSetByIndex(
                     indices[i].getDataSetIndex());
 
-            if (set == null)
+            if (set == null || !set.isHighlightEnabled())
                 continue;
 
             mHighlightPaint.setColor(set.getHighLightColor());

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java
@@ -535,7 +535,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             LineDataSet set = mChart.getLineData().getDataSetByIndex(indices[i]
                     .getDataSetIndex());
 
-            if (set == null)
+            if (set == null || !set.isHighlightEnabled())
                 continue;
 
             mHighlightPaint.setColor(set.getHighLightColor());

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java
@@ -384,6 +384,13 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             if (xIndex >= drawAngles.length)
                 continue;
 
+            PieDataSet set = mChart.getData()
+                    .getDataSetByIndex(indices[i]
+                            .getDataSetIndex());
+
+            if (set == null || !set.isHighlightEnabled())
+                continue;
+
             if (xIndex == 0)
                 angle = rotationAngle;
             else
@@ -393,13 +400,6 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
 
             float sliceDegrees = drawAngles[xIndex];
 
-            PieDataSet set = mChart.getData()
-                    .getDataSetByIndex(indices[i]
-                            .getDataSetIndex());
-
-            if (set == null)
-                continue;
-
             float shift = set.getSelectionShift();
             RectF circleBox = mChart.getCircleBox();
 

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/RadarChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/RadarChartRenderer.java
@@ -210,7 +210,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
                     .getDataSetByIndex(indices[i]
                             .getDataSetIndex());
 
-            if (set == null)
+            if (set == null || !set.isHighlightEnabled())
                 continue;
 
             mHighlightPaint.setColor(set.getHighLightColor());

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/ScatterChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/ScatterChartRenderer.java
@@ -255,7 +255,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             ScatterDataSet set = mChart.getScatterData().getDataSetByIndex(indices[i]
                     .getDataSetIndex());
 
-            if (set == null)
+            if (set == null || !set.isHighlightEnabled())
                 continue;
 
             mHighlightPaint.setColor(set.getHighLightColor());