Fixed example project crash, fixed issues concerning dynamical data adding.

PhilJay · PhilJay · commit 70454009bcdc · 2014-10-01T21:05:00.000+02:00
diff --git a/MPChartExample/libs/mpandroidchartlibrary-1-6-3.jar b/MPChartExample/libs/mpandroidchartlibrary-1-6-3.jar
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java
@@ -131,7 +131,7 @@ private BarData generateData(int cnt) {
 
         BarDataSet d = new BarDataSet(entries, "New DataSet " + cnt);    
         d.setBarSpacePercent(20f);
-        d.setColors(ColorTemplate.VORDIPLOM_COLORS, getApplicationContext());
+        d.setColors(ColorTemplate.VORDIPLOM_COLORS);
         d.setBarShadowColor(Color.rgb(203, 203, 203));
         
         ArrayList<BarDataSet> sets = new ArrayList<BarDataSet>();
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
@@ -347,9 +347,9 @@ public void setData(T data) {
                     "Cannot set data for chart. Provided data object is null.");
             return;
         }
-        
-//        Log.i(LOG_TAG, "xvalcount: " + data.getXValCount());
-//        Log.i(LOG_TAG, "entrycount: " + data.getYValCount());
+
+        // Log.i(LOG_TAG, "xvalcount: " + data.getXValCount());
+        // Log.i(LOG_TAG, "entrycount: " + data.getYValCount());
 
         // LET THE CHART KNOW THERE IS DATA
         mDataNotSet = false;
@@ -633,9 +633,9 @@ protected float[] generateTransformedValuesLineScatter(ArrayList<? extends Entry
         float[] valuePoints = new float[entries.size() * 2];
 
         for (int j = 0; j < valuePoints.length; j += 2) {
-            
+
             Entry e = entries.get(j / 2);
-            
+
             valuePoints[j] = e.getXIndex();
             valuePoints[j + 1] = e.getVal() * mPhaseY;
         }
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/LineChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/LineChart.java
@@ -56,11 +56,14 @@ protected void init() {
     protected void calcMinMax(boolean fixedValues) {
         super.calcMinMax(fixedValues);
 
-        // if there is only one value in the chart
-        if (mOriginalData.getYValCount() == 1
-                || mOriginalData.getYValCount() <= mOriginalData.getDataSetCount()) {
+        // // if there is only one value in the chart
+        // if (mOriginalData.getYValCount() == 1
+        // || mOriginalData.getYValCount() <= mOriginalData.getDataSetCount()) {
+        // mDeltaX = 1;
+        // }
+
+        if (mDeltaX == 0 && mOriginalData.getYValCount() > 0)
             mDeltaX = 1;
-        }
     }
 
     @Override
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/ScatterChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/ScatterChart.java
@@ -36,6 +36,14 @@ public ScatterChart(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
+    @Override
+    protected void calcMinMax(boolean fixedValues) {
+        super.calcMinMax(fixedValues);
+
+        if (mDeltaX == 0 && mOriginalData.getYValCount() > 0)
+            mDeltaX = 1;
+    }
+
     @Override
     protected void drawData() {
 
@@ -144,7 +152,8 @@ protected void drawValues() {
 
                     if (mDrawUnitInChart) {
 
-                        mDrawCanvas.drawText(mValueFormatter.getFormattedValue(val) + mUnit, positions[j],
+                        mDrawCanvas.drawText(mValueFormatter.getFormattedValue(val) + mUnit,
+                                positions[j],
                                 positions[j + 1] - shapeSize, mValuePaint);
                     } else {
 
@@ -162,8 +171,9 @@ protected void drawHighlights() {
 
         for (int i = 0; i < mIndicesToHightlight.length; i++) {
 
-            ScatterDataSet set = mCurrentData.getDataSetByIndex(mIndicesToHightlight[i].getDataSetIndex());
-            
+            ScatterDataSet set = mCurrentData.getDataSetByIndex(mIndicesToHightlight[i]
+                    .getDataSetIndex());
+
             mHighlightPaint.setColor(set.getHighLightColor());
 
             int xIndex = mIndicesToHightlight[i].getXIndex(); // get the
