Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ abstract class AbstractBuffer<T>(size: Int) {

/** float-buffer that holds the data points to draw, order: x,y,x,y,... */
@JvmField
val buffer: FloatArray
var buffer: MutableList<Float> = mutableListOf()

/** animation phase x-axis */
@JvmField
Expand All @@ -30,7 +30,7 @@ abstract class AbstractBuffer<T>(size: Int) {

init {
index = 0
buffer = FloatArray(size)
buffer = FloatArray(size).toMutableList()
}

/** limits the drawing on the x-axis */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : Ab
", containsStacks=" + containsStacks +
", inverted=" + inverted +
", barWidth=" + barWidth +
", buffer=" + buffer.contentToString() +
", buffer=" + buffer +
", index=" + index +
'}'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ open class BarChartRenderer(
val barData = chart.barData
barBuffers = mutableListOf()

barData.dataSets.forEach {
barData.dataSets.forEach { iBarDataSet ->
barBuffers.add(
BarBuffer(
it.entryCount * 4 * (if (it.isStacked) it.stackSize else 1),
barData.dataSetCount, it.isStacked
iBarDataSet.entryCount * 4 * (if (iBarDataSet.isStacked) iBarDataSet.stackSize else 1),
barData.dataSetCount, iBarDataSet.isStacked
)
)
}
Expand Down Expand Up @@ -163,7 +163,7 @@ open class BarChartRenderer(
setBarWidth(chart.barData.barWidth)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ open class HorizontalBarChartRenderer(

buffer.feed(dataSet)

trans!!.pointValuesToPixel(buffer.buffer)
trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())

val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
val isCustomFill = dataSet.fills != null && !dataSet.fills.isEmpty()
val isSingleColor = dataSet.colors.size == 1
val isInverted = chart.isInverted(dataSet.axisDependency)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
}
}

val buffer = barBuffers!![index]!!
val buffer = barBuffers[index]!!
buffer.setPhases(phaseX, phaseY)
buffer.setDataSet(index)
buffer.setInverted(chart.isInverted(dataSet.axisDependency))
buffer.setBarWidth(chart.barData.barWidth)
buffer.feed(dataSet)
trans!!.pointValuesToPixel(buffer.buffer)
trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())

// if multiple colors has been assigned to Bar Chart
if (dataSet.colors.size > 1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
buffer.setInverted(chart.isInverted(dataSet.axisDependency))
buffer.setBarWidth(chart.barData.barWidth)
buffer.feed(dataSet)
trans!!.pointValuesToPixel(buffer.buffer)
trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())

// if multiple colors has been assigned to Bar Chart
if (dataSet.colors.size > 1) {
Expand Down
Loading