Skip to content

Cleanup Renderer #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Dec 28, 2025
Merged

Cleanup Renderer #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ open class HorizontalBarChartRenderer(
viewPortHandler: ViewPortHandler
) : BarChartRenderer(dataProvider, animator, viewPortHandler) {
override fun initBuffers() {
this@HorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->
barBuffers = arrayOfNulls<HorizontalBarBuffer>(barData.dataSetCount).toMutableList()

for (i in barBuffers.indices) {
Expand All @@ -48,7 +48,7 @@ open class HorizontalBarChartRenderer(
}

override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
val trans = this@HorizontalBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
val trans = dataProvider.getTransformer(dataSet.axisDependency)

barBorderPaint.color = dataSet.barBorderColor
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
Expand All @@ -59,10 +59,10 @@ open class HorizontalBarChartRenderer(
val phaseY = animator.phaseY

// draw the bar shadow before the values
if (this@HorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
shadowPaint.color = dataSet.barShadowColor

this@HorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->

val barWidth = barData.barWidth
val barWidthHalf = barWidth / 2.0f
Expand Down Expand Up @@ -103,16 +103,16 @@ open class HorizontalBarChartRenderer(
val buffer = barBuffers[index]!!
buffer.setPhases(phaseX, phaseY)
buffer.setDataSet(index)
buffer.inverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
this@HorizontalBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
dataProvider.barData?.let { buffer.barWidth = it.barWidth }

buffer.feed(dataSet)

trans!!.pointValuesToPixel(buffer.buffer)

val isCustomFill = dataSet.fills.isNotEmpty()
val isSingleColor = dataSet.colors.size == 1
val isInverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
val isInverted = dataProvider.isInverted(dataSet.axisDependency)

if (isSingleColor) {
paintRender.color = dataSet.color
Expand Down Expand Up @@ -166,15 +166,15 @@ open class HorizontalBarChartRenderer(
}

override fun drawValues(canvas: Canvas) {
if (isDrawingValuesAllowed(this@HorizontalBarChartRenderer.dataProvider)) {
val dataSets = this@HorizontalBarChartRenderer.dataProvider.barData?.dataSets
if (isDrawingValuesAllowed(dataProvider)) {
val dataSets = dataProvider.barData?.dataSets

val valueOffsetPlus = 5f.convertDpToPixel()
var posOffset: Float
var negOffset: Float
val drawValueAboveBar = this@HorizontalBarChartRenderer.dataProvider.isDrawValueAboveBarEnabled
val drawValueAboveBar = dataProvider.isDrawValueAboveBarEnabled

this@HorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->
for (i in 0..<barData.dataSetCount) {
val dataSet = dataSets!![i]
if (dataSet.entryCount == 0) {
Expand All @@ -184,7 +184,7 @@ open class HorizontalBarChartRenderer(
continue
}

val isInverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
val isInverted = dataProvider.isInverted(dataSet.axisDependency)

// apply the text-styling defined by the DataSet
applyValueTextStyle(dataSet)
Expand Down Expand Up @@ -270,7 +270,7 @@ open class HorizontalBarChartRenderer(

// if each value of a potential stack should be drawn
} else {
val trans = this@HorizontalBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
val trans = dataProvider.getTransformer(dataSet.axisDependency)

var bufferIndex = 0
var index = 0
Expand Down
21 changes: 10 additions & 11 deletions chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import info.appdev.charting.utils.ViewPortHandler
import info.appdev.charting.utils.convertDpToPixel
import kotlin.math.min

@Suppress("unused")
class RoundedBarChartRenderer(
dataProvider: BarDataProvider,
animator: ChartAnimator,
Expand All @@ -27,16 +26,16 @@ class RoundedBarChartRenderer(

override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
initBuffers()
val trans = this@RoundedBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
val trans = dataProvider.getTransformer(dataSet.axisDependency)
barBorderPaint.color = dataSet.barBorderColor
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
shadowPaint.color = dataSet.barShadowColor
val phaseX = animator.phaseX
val phaseY = animator.phaseY

if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
shadowPaint.color = dataSet.barShadowColor
this@RoundedBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->
val barWidth = barData.barWidth
val barWidthHalf = barWidth / 2.0f
var x: Float
Expand Down Expand Up @@ -73,8 +72,8 @@ class RoundedBarChartRenderer(
val buffer = barBuffers[index]!!
buffer.setPhases(phaseX, phaseY)
buffer.setDataSet(index)
buffer.inverted = this@RoundedBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
this@RoundedBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
dataProvider.barData?.let { buffer.barWidth = it.barWidth }
buffer.feed(dataSet)
trans!!.pointValuesToPixel(buffer.buffer)

Expand All @@ -92,7 +91,7 @@ class RoundedBarChartRenderer(
break
}

if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
if (roundedShadowRadius > 0) {
canvas.drawRoundRect(
RectF(
Expand Down Expand Up @@ -142,7 +141,7 @@ class RoundedBarChartRenderer(
break
}

if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
if (roundedShadowRadius > 0) {
canvas.drawRoundRect(
RectF(
Expand Down Expand Up @@ -248,7 +247,7 @@ class RoundedBarChartRenderer(
}

override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
this@RoundedBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->

for (high in indices) {
val set = barData.getDataSetByIndex(high.dataSetIndex)
Expand All @@ -263,7 +262,7 @@ class RoundedBarChartRenderer(
continue
}

val trans = this@RoundedBarChartRenderer.dataProvider.getTransformer(set.axisDependency)
val trans = dataProvider.getTransformer(set.axisDependency)

paintHighlight.color = set.highLightColor
paintHighlight.alpha = set.highLightAlpha
Expand All @@ -274,7 +273,7 @@ class RoundedBarChartRenderer(
val y2: Float

if (isStack) {
if (this@RoundedBarChartRenderer.dataProvider.isHighlightFullBarEnabled) {
if (dataProvider.isHighlightFullBarEnabled) {
y1 = barEntry.positiveSum
y2 = -barEntry.negativeSum
} else {
Expand Down
15 changes: 7 additions & 8 deletions chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import info.appdev.charting.utils.ViewPortHandler
import info.appdev.charting.utils.convertDpToPixel
import kotlin.math.min

@Suppress("unused")
class RoundedHorizontalBarChartRenderer(
dataProvider: BarDataProvider,
animator: ChartAnimator,
Expand All @@ -28,16 +27,16 @@ class RoundedHorizontalBarChartRenderer(

override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
initBuffers()
val trans = this@RoundedHorizontalBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
val trans = dataProvider.getTransformer(dataSet.axisDependency)
barBorderPaint.color = dataSet.barBorderColor
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
shadowPaint.color = dataSet.barShadowColor
val phaseX = animator.phaseX
val phaseY = animator.phaseY

if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
shadowPaint.color = dataSet.barShadowColor
this@RoundedHorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
dataProvider.barData?.let { barData ->
val barWidth = barData.barWidth
val barWidthHalf = barWidth / 2.0f
var x: Float
Expand Down Expand Up @@ -72,8 +71,8 @@ class RoundedHorizontalBarChartRenderer(
val buffer = barBuffers[index]!!
buffer.setPhases(phaseX, phaseY)
buffer.setDataSet(index)
buffer.inverted = this@RoundedHorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
this@RoundedHorizontalBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
dataProvider.barData?.let { buffer.barWidth = it.barWidth }
buffer.feed(dataSet)
trans!!.pointValuesToPixel(buffer.buffer)

Expand All @@ -90,7 +89,7 @@ class RoundedHorizontalBarChartRenderer(
break
}

if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
if (roundedShadowRadius > 0) {
canvas.drawRoundRect(
RectF(
Expand Down Expand Up @@ -140,7 +139,7 @@ class RoundedHorizontalBarChartRenderer(
break
}

if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
if (dataProvider.isDrawBarShadowEnabled) {
if (roundedShadowRadius > 0) {
canvas.drawRoundRect(
RectF(
Expand Down
10 changes: 5 additions & 5 deletions chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ open class XAxisRenderer(
var minLocal = min
var maxLocal = max
if (viewPortHandler.contentWidth() > 10 && !viewPortHandler.isFullyZoomedOutX) {
val p1 = this@XAxisRenderer.transformer!!.getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentTop())
val p2 = this@XAxisRenderer.transformer!!.getValuesByTouchPoint(viewPortHandler.contentRight(), viewPortHandler.contentTop())
val p1 = transformer!!.getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentTop())
val p2 = transformer!!.getValuesByTouchPoint(viewPortHandler.contentRight(), viewPortHandler.contentTop())

if (inverted) {
minLocal = p2.x.toFloat()
Expand Down Expand Up @@ -194,7 +194,7 @@ open class XAxisRenderer(
}
}

this@XAxisRenderer.transformer!!.pointValuesToPixel(positions)
transformer!!.pointValuesToPixel(positions)

var i = 0
while (i < positions.size) {
Expand Down Expand Up @@ -265,7 +265,7 @@ open class XAxisRenderer(
}
}

this@XAxisRenderer.transformer!!.pointValuesToPixel(positions)
transformer!!.pointValuesToPixel(positions)

setupGridPaint()

Expand Down Expand Up @@ -364,7 +364,7 @@ open class XAxisRenderer(
position[0] = limitLine.limit
position[1] = 0f

this@XAxisRenderer.transformer?.pointValuesToPixel(position)
transformer?.pointValuesToPixel(position)

renderLimitLineLine(canvas, limitLine, position)
renderLimitLineLabel(canvas, limitLine, position, 2f + limitLine.yOffset)
Expand Down
Loading