AbstractBuffer buffer as MutableList

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt

@@ -5,14 +5,14 @@ package com.github.mikephil.charting.buffer
  *
  * @param <T> The data the buffer accepts to be fed with.
 </T> */
-abstract class AbstractBuffer<T>(size: Int) {
+abstract class AbstractBuffer<T> {
     /** index in the buffer  */
     @JvmField
     protected var index: Int = 0
 
     /** float-buffer that holds the data points to draw, order: x,y,x,y,...  */
     @JvmField
-    val buffer: FloatArray
+    val buffer: MutableList<Float> = mutableListOf()
 
     /** animation phase x-axis  */
     @JvmField
@@ -35,7 +35,6 @@ abstract class AbstractBuffer<T>(size: Int) {
      */
     init {
         index = 0
-        buffer = FloatArray(size)
     }
 
     /** limits the drawing on the x-axis  */

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.java

@@ -7,16 +7,16 @@
 public class BarBuffer extends AbstractBuffer<IBarDataSet> {
 
     protected int mDataSetIndex = 0;
-    protected int mDataSetCount = 1;
-    protected boolean mContainsStacks = false;
+	protected int mDataSetCount;
+    protected boolean mContainsStacks;
     protected boolean mInverted = false;
 
     /** width of the bar on the x-axis, in values (not pixels) */
     protected float mBarWidth = 1f;
 
-    public BarBuffer(int size, int dataSetCount, boolean containsStacks) {
-        super(size);
-        this.mDataSetCount = dataSetCount;
+    public BarBuffer(int dataSetCount, boolean containsStacks) {
+        super();
+		this.mDataSetCount = dataSetCount;
         this.mContainsStacks = containsStacks;
     }
 
@@ -33,11 +33,10 @@ public void setInverted(boolean inverted) {
     }
 
     protected void addBar(float left, float top, float right, float bottom) {
-
-        buffer[index++] = left;
-        buffer[index++] = top;
-        buffer[index++] = right;
-        buffer[index++] = bottom;
+        buffer.add(left);
+        buffer.add(top);
+        buffer.add(right);
+        buffer.add(bottom);
     }
 
     @Override
@@ -83,45 +82,43 @@ public void feed(IBarDataSet data) {
 
                 float posY = 0f;
                 float negY = -e.getNegativeSum();
-                float yStart = 0f;
+                float yStart;
 
                 // fill the stack
-                for (int k = 0; k < vals.length; k++) {
-
-                    float value = vals[k];
-
-                    if (value == 0.0f && (posY == 0.0f || negY == 0.0f)) {
-                        // Take care of the situation of a 0.0 value, which overlaps a non-zero bar
-                        y = value;
-                        yStart = y;
-                    } else if (value >= 0.0f) {
-                        y = posY;
-                        yStart = posY + value;
-                        posY = yStart;
-                    } else {
-                        y = negY;
-                        yStart = negY + Math.abs(value);
-                        negY += Math.abs(value);
-                    }
-
-                    float left = x - barWidthHalf;
-                    float right = x + barWidthHalf;
-                    float bottom, top;
-
-                    if (mInverted) {
-                        bottom = y >= yStart ? y : yStart;
-                        top = y <= yStart ? y : yStart;
-                    } else {
-                        top = y >= yStart ? y : yStart;
-                        bottom = y <= yStart ? y : yStart;
-                    }
-
-                    // multiply the height of the rect with the phase
-                    top *= phaseY;
-                    bottom *= phaseY;
-
-                    addBar(left, top, right, bottom);
-                }
+				for (float value : vals) {
+
+					if (value == 0.0f && (posY == 0.0f || negY == 0.0f)) {
+						// Take care of the situation of a 0.0 value, which overlaps a non-zero bar
+						y = value;
+						yStart = y;
+					} else if (value >= 0.0f) {
+						y = posY;
+						yStart = posY + value;
+						posY = yStart;
+					} else {
+						y = negY;
+						yStart = negY + Math.abs(value);
+						negY += Math.abs(value);
+					}
+
+					float left = x - barWidthHalf;
+					float right = x + barWidthHalf;
+					float bottom, top;
+
+					if (mInverted) {
+						bottom = Math.max(y, yStart);
+						top = Math.min(y, yStart);
+					} else {
+						top = Math.max(y, yStart);
+						bottom = Math.min(y, yStart);
+					}
+
+					// multiply the height of the rect with the phase
+					top *= phaseY;
+					bottom *= phaseY;
+
+					addBar(left, top, right, bottom);
+				}
             }
         }
 

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.java

@@ -7,7 +7,7 @@
 public class HorizontalBarBuffer extends BarBuffer {
 
     public HorizontalBarBuffer(int size, int dataSetCount, boolean containsStacks) {
-        super(size, dataSetCount, containsStacks);
+        super(dataSetCount, containsStacks);
     }
 
     @Override

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt

@@ -61,7 +61,6 @@ open class BarChartRenderer(
         barData.dataSets.forEach {
             barBuffers.add(
                 BarBuffer(
-                    it.entryCount * 4 * (if (it.isStacked) it.stackSize else 1),
                     barData.dataSetCount, it.isStacked
                 )
             )
@@ -164,7 +163,7 @@ open class BarChartRenderer(
 
         buffer.feed(dataSet)
 
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
         val isSingleColor = dataSet.colors.size == 1