Introducing the clearValues() method that only removes entries but not x-values.

PhilJay · PhilJay · commit 26f8f655fba9 · 2015-03-11T12:25:46.000+01:00
diff --git a/MPChartExample/res/menu/realtime.xml b/MPChartExample/res/menu/realtime.xml
@@ -5,4 +5,8 @@
         android:id="@+id/actionAdd"
         android:title="Feed new Entry">
     </item>
+    <item
+        android:id="@+id/actionClear"
+        android:title="Clear Values">
+    </item>
 </menu>
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RealtimeLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RealtimeLineChartActivity.java
@@ -8,6 +8,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
+import android.widget.Toast;
 
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.components.Legend;
@@ -61,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         LineData data = new LineData();
         data.setValueTextColor(Color.WHITE);
-        
+
         // add empty data
         mChart.setData(data);
 
@@ -87,7 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
         leftAxis.setTextColor(Color.WHITE);
         leftAxis.setAxisMaxValue(120f);
         leftAxis.setDrawGridLines(true);
-        
+
         YAxis rightAxis = mChart.getAxisRight();
         rightAxis.setEnabled(false);
     }
@@ -106,12 +107,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 addEntry();
                 break;
             }
+            case R.id.actionClear: {
+                mChart.clearValues();
+                Toast.makeText(this, "Chart cleared!", Toast.LENGTH_SHORT).show();
+                break;
+            }
         }
         return true;
     }
 
     private int year = 15;
-    
+
     private void addEntry() {
 
         LineData data = mChart.getData();
@@ -127,24 +133,26 @@ private void addEntry() {
             }
 
             // add a new x-value first
-            data.addXValue(mMonths[data.getXValCount() % 12] + " " + (year + data.getXValCount() / 12));
+            data.addXValue(mMonths[data.getXValCount() % 12] + " "
+                    + (year + data.getXValCount() / 12));
             data.addEntry(new Entry((float) (Math.random() * 40) + 40f, set.getEntryCount()), 0);
 
             // let the chart know it's data has changed
             mChart.notifyDataSetChanged();
 
             // limit the number of visible entries
-             mChart.setVisibleXRange(6);
+            mChart.setVisibleXRange(6);
             // mChart.setVisibleYRange(30, AxisDependency.LEFT);
-            
-             // move to the latest entry
-             mChart.moveViewToX(data.getXValCount()-7);
-             
-             // this automatically refreshes the chart (calls invalidate())
-//             mChart.moveViewTo(data.getXValCount()-7, 55f, AxisDependency.LEFT);
+
+            // move to the latest entry
+            mChart.moveViewToX(data.getXValCount() - 7);
+
+            // this automatically refreshes the chart (calls invalidate())
+            // mChart.moveViewTo(data.getXValCount()-7, 55f,
+            // AxisDependency.LEFT);
 
             // redraw the chart
-//            mChart.invalidate();
+            // mChart.invalidate();
         }
     }
 
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
@@ -278,15 +278,24 @@ public void setData(T data) {
     }
 
     /**
-     * Clears the chart from all data and refreshes it (by calling
-     * invalidate()).
+     * Clears the chart from all data (sets it to null) and refreshes it (by
+     * calling invalidate()).
      */
     public void clear() {
         mData = null;
         mDataNotSet = true;
         invalidate();
     }
 
+    /**
+     * Removes all DataSets (and thereby Entries) from the chart. Does not
+     * remove the x-values.
+     */
+    public void clearValues() {
+        mData.clearValues();
+        invalidate();
+    }
+
     /**
      * Returns true if the chart is empty (meaning it's data object is either
      * null or contains no entries).
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java b/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java
@@ -879,4 +879,12 @@ public void setDrawValues(boolean enabled) {
             set.setDrawValues(enabled);
         }
     }
+
+    /**
+     * Clears this data object from all DataSets and removes all Entries.
+     */
+    public void clearValues() {
+        mDataSets.clear();
+        notifyDataChanged();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -879,4 +879,12 @@ public void setDrawValues(boolean enabled) {`
`879`	`879`	`set.setDrawValues(enabled);`
`880`	`880`	`}`
`881`	`881`	`}`
	`882`	`+`
	`883`	`+ /**`
	`884`	`+ * Clears this data object from all DataSets and removes all Entries.`
	`885`	`+ */`
	`886`	`+ public void clearValues() {`
	`887`	`+ mDataSets.clear();`
	`888`	`+ notifyDataChanged();`
	`889`	`+ }`
`882`	`890`	`}`