Revert "Crash fix - Create small clip paths (PhilJay#1895)"

This reverts commit d5df3ad.

Author: tonypatino-monoclesociety

MPChartExample/res/layout/activity_linechart.xml

@@ -18,7 +18,7 @@
         android:layout_margin="8dp"
         android:layout_toLeftOf="@+id/tvYMax"
         android:layout_marginRight="5dp"
-        android:max="150"
+        android:max="200"
         android:paddingBottom="12dp" />
 
     <SeekBar
@@ -30,7 +30,7 @@
         android:layout_marginBottom="35dp"
         android:layout_toLeftOf="@+id/tvXMax"
         android:layout_marginRight="5dp"
-        android:max="1500"
+        android:max="500"
         android:paddingBottom="12dp" />
 
     <TextView

MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java

@@ -111,7 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Typeface tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
 
-        LimitLine ll1 = new LimitLine(150f, "Upper Limit");
+        LimitLine ll1 = new LimitLine(130f, "Upper Limit");
         ll1.setLineWidth(4f);
         ll1.enableDashedLine(10f, 10f, 0f);
         ll1.setLabelPosition(LimitLabelPosition.RIGHT_TOP);
@@ -129,7 +129,7 @@ protected void onCreate(Bundle savedInstanceState) {
         leftAxis.removeAllLimitLines(); // reset all limit lines to avoid overlapping lines
         leftAxis.addLimitLine(ll1);
         leftAxis.addLimitLine(ll2);
-        leftAxis.setAxisMaxValue(200f);
+        leftAxis.setAxisMaxValue(220f);
         leftAxis.setAxisMinValue(-50f);
         //leftAxis.setYOffset(20f);
         leftAxis.enableGridDashedLine(10f, 10f, 0f);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/RealtimeLineChartActivity.java

@@ -157,7 +157,7 @@ private LineDataSet createSet() {
         LineDataSet set = new LineDataSet(null, "Dynamic Data");
         set.setAxisDependency(AxisDependency.LEFT);
         set.setColor(ColorTemplate.getHoloBlue());
-        set.setCircleColors(ColorTemplate.COLORFUL_COLORS);
+        set.setCircleColor(Color.WHITE);
         set.setLineWidth(2f);
         set.setCircleRadius(4f);
         set.setFillAlpha(65);

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java

@@ -449,8 +449,6 @@ protected void drawLinear(Canvas c, ILineDataSet dataSet) {
         }
     }
 
-    protected Path mGenerateFilledPathBuffer = new Path();
-
     /**
      * Draws a filled linear path on the canvas.
      *
@@ -461,92 +459,60 @@ protected void drawLinear(Canvas c, ILineDataSet dataSet) {
      */
     protected void drawLinearFill(Canvas c, ILineDataSet dataSet, Transformer trans, XBounds bounds) {
 
-        final Path filled = mGenerateFilledPathBuffer;
-
-        final int startingIndex = bounds.min;
-        final int endingIndex = bounds.range + bounds.min;
-        final int indexInterval = 128;
-
-        int currentStartIndex = 0;
-        int currentEndIndex = indexInterval;
-        int iterations = 0;
-
-        // Doing this iteratively in order to avoid OutOfMemory errors that can happen on large bounds sets.
-        do{
-            currentStartIndex = startingIndex + (iterations * indexInterval);
-            currentEndIndex = currentStartIndex + indexInterval;
-            currentEndIndex = currentEndIndex > endingIndex ? endingIndex : currentEndIndex;
-
-            if(currentStartIndex <= currentEndIndex) {
-                generateFilledPath(dataSet, currentStartIndex, currentEndIndex, filled);
-
+        Path filled = generateFilledPath(dataSet, bounds);
 
+        trans.pathValueToPixel(filled);
 
-                trans.pathValueToPixel(filled);
-
-                final Drawable drawable = dataSet.getFillDrawable();
-                if (drawable != null) {
-
-                    drawFilledPath(c, filled, drawable);
-                } else {
-
-                    drawFilledPath(c, filled, dataSet.getFillColor(), dataSet.getFillAlpha());
-                }
-            }
-
-            iterations++;
+        final Drawable drawable = dataSet.getFillDrawable();
+        if (drawable != null) {
 
-        }while(currentStartIndex <= currentEndIndex);
+            drawFilledPath(c, filled, drawable);
+        } else {
 
+            drawFilledPath(c, filled, dataSet.getFillColor(), dataSet.getFillAlpha());
+        }
     }
 
+    protected Path mGenerateFilledPathBuffer = new Path();
     /**
-     * Generates a path that is used for filled drawing.
-     *
-     * @param dataSet The dataset from which to read the entries.
-     * @param startIndex The index from which to start reading the dataset
-     * @param endIndex The index from which to stop reading the dataset
-     * @param outputPath The path object that will be assigned the chart data.
+     * Generates the path that is used for filled drawing.
      *
+     * @param dataSet
      * @return
      */
-    private void generateFilledPath(final ILineDataSet dataSet, final int startIndex, final int endIndex, final Path outputPath) {
+    private Path generateFilledPath(ILineDataSet dataSet, XBounds bounds) {
 
-        final float fillMin = dataSet.getFillFormatter().getFillLinePosition(dataSet, mChart);
-        final float phaseY = mAnimator.getPhaseY();
+        float fillMin = dataSet.getFillFormatter().getFillLinePosition(dataSet, mChart);
+        float phaseY = mAnimator.getPhaseY();
         final boolean isDrawSteppedEnabled = dataSet.getMode() == LineDataSet.Mode.STEPPED;
 
-        final Path filled = outputPath;
+        Path filled = mGenerateFilledPathBuffer;
         filled.reset();
-
-        final Entry entry = dataSet.getEntryForIndex(startIndex);
+        Entry entry = dataSet.getEntryForIndex(bounds.min);
 
         filled.moveTo(entry.getX(), fillMin);
         filled.lineTo(entry.getX(), entry.getY() * phaseY);
 
         // create a new path
-        Entry currentEntry = null;
-        Entry previousEntry = null;
-        for (int x = startIndex + 1 ; x <= endIndex ; x++) {
+        for (int x = bounds.min + 1; x <= bounds.range + bounds.min; x++) {
 
-            currentEntry = dataSet.getEntryForIndex(x);
+            Entry e = dataSet.getEntryForIndex(x);
 
-            if (isDrawSteppedEnabled && previousEntry != null) {
-                filled.lineTo(currentEntry.getX(), previousEntry.getY() * phaseY);
-            }
+            if (isDrawSteppedEnabled) {
+                final Entry ePrev = dataSet.getEntryForIndex(x - 1);
+                if (ePrev == null) continue;
 
-            filled.lineTo(currentEntry.getX(), currentEntry.getY() * phaseY);
+                filled.lineTo(e.getX(), ePrev.getY() * phaseY);
+            }
 
-            previousEntry = currentEntry;
+            filled.lineTo(e.getX(), e.getY() * phaseY);
         }
 
         // close up
-        if(currentEntry != null) {
-            filled.lineTo(currentEntry.getX(), fillMin);
-        }
-
+        filled.lineTo(dataSet.getEntryForIndex(bounds.range + bounds.min).getX(), fillMin);
         filled.close();
 
+        return filled;
     }
 
     @Override