Fixed issue concerning multiple lines not being drawn with one entry (issue PhilJay#127).

PhilJay · PhilJay · commit f516b4587d89 · 2014-09-30T10:47:10.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/MultiLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java
@@ -200,14 +200,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 
-        tvX.setText("" + (mSeekBarX.getProgress() + 1));
+        tvX.setText("" + (mSeekBarX.getProgress()));
         tvY.setText("" + (mSeekBarY.getProgress()));
 
         ArrayList<String> xVals = new ArrayList<String>();
         for (int i = 0; i < mSeekBarX.getProgress(); i++) {
             xVals.add((i) + "");
         }
-
+ 
         ArrayList<LineDataSet> dataSets = new ArrayList<LineDataSet>();
 
         for (int z = 0; z < 3; z++) {
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -327,9 +327,7 @@ protected void calculateOffsets() {
         // calculate the maximum y-label width (including eventual offsets)
         float ylabelwidth = Utils.calcTextWidth(mYLabelPaint,
                 label + mUnit + (mYChartMin < 0 ? "----" : "+++")); // offsets
-
-        Log.i(LOG_TAG, "OFFSETS, labelwidth: " + ylabelwidth + ", label: " + label);
-
+        
         if (mDrawYLabels) {
 
             // offsets for y-labels
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
@@ -347,6 +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());
 
         // LET THE CHART KNOW THERE IS DATA
         mDataNotSet = false;
@@ -630,8 +633,11 @@ protected float[] generateTransformedValuesLineScatter(ArrayList<? extends Entry
         float[] valuePoints = new float[entries.size() * 2];
 
         for (int j = 0; j < valuePoints.length; j += 2) {
-            valuePoints[j] = entries.get(j / 2).getXIndex();
-            valuePoints[j + 1] = entries.get(j / 2).getVal() * mPhaseY;
+            
+            Entry e = entries.get(j / 2);
+            
+            valuePoints[j] = e.getXIndex();
+            valuePoints[j + 1] = e.getVal() * mPhaseY;
         }
 
         transformPointArray(valuePoints);
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/LineChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/LineChart.java
@@ -57,7 +57,8 @@ protected void calcMinMax(boolean fixedValues) {
         super.calcMinMax(fixedValues);
 
         // if there is only one value in the chart
-        if (mOriginalData.getYValCount() == 1) {
+        if (mOriginalData.getYValCount() == 1
+                || mOriginalData.getYValCount() <= mOriginalData.getDataSetCount()) {
             mDeltaX = 1;
         }
     }
@@ -366,14 +367,15 @@ protected void drawAdditional() {
 
                     // make sure the circles don't do shitty things outside
                     // bounds
-                    if (isOffContentLeft(positions[j]) || isOffContentTop(positions[j + 1])
+                    if (isOffContentLeft(positions[j]) ||
+                            isOffContentTop(positions[j + 1])
                             || isOffContentBottom(positions[j + 1]))
                         continue;
 
                     mDrawCanvas.drawCircle(positions[j], positions[j + 1], dataSet.getCircleSize(),
                             mRenderPaint);
                     mDrawCanvas.drawCircle(positions[j], positions[j + 1],
-                            dataSet.getCircleSize() / 2,
+                            dataSet.getCircleSize() / 2f,
                             mCirclePaintInner);
                 }
             } // else do nothing
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java b/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java
@@ -294,20 +294,20 @@ public int getYValCount() {
         return mYValCount;
     }
 
-    /**
-     * Checks if the ChartData object contains valid data
-     * 
-     * @return
-     */
-    public boolean isValid() {
-        if (mXVals == null || mXVals.size() < 1)
-            return false;
-
-        if (mDataSets == null || mDataSets.size() < 1)
-            return false;
-
-        return true;
-    }
+    // /**
+    // * Checks if the ChartData object contains valid data
+    // *
+    // * @return
+    // */
+    // public boolean isValid() {
+    // if (mXVals == null || mXVals.size() < 1)
+    // return false;
+    //
+    // if (mDataSets == null || mDataSets.size() < 1)
+    // return false;
+    //
+    // return true;
+    // }
 
     /**
      * returns the x-values the chart represents
@@ -613,6 +613,9 @@ public T getDataSetForEntry(Entry e) {
      */
     public int[] getColors() {
 
+        if (mDataSets == null)
+            return null;
+
         int clrcnt = 0;
 
         for (int i = 0; i < mDataSets.size(); i++) {
