Skip to content

Commit 99ad26d

Browse files
hannesa2hannesa2
authored
Merge pull request #601 from AppDevNext/CleanupRenderer
Cleanup Renderer
2 parents 74f6a13 + a8f080b commit 99ad26d

File tree

4 files changed

+35
-37
lines changed

4 files changed

+35
-37
lines changed

‎chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ open class HorizontalBarChartRenderer(
2626
viewPortHandler: ViewPortHandler
2727
) : BarChartRenderer(dataProvider, animator, viewPortHandler) {
2828
override fun initBuffers() {
29-
this@HorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
29+
dataProvider.barData?.let { barData ->
3030
barBuffers = arrayOfNulls<HorizontalBarBuffer>(barData.dataSetCount).toMutableList()
3131

3232
for (i in barBuffers.indices) {
@@ -48,7 +48,7 @@ open class HorizontalBarChartRenderer(
4848
}
4949

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

5353
barBorderPaint.color = dataSet.barBorderColor
5454
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
@@ -59,10 +59,10 @@ open class HorizontalBarChartRenderer(
5959
val phaseY = animator.phaseY
6060

6161
// draw the bar shadow before the values
62-
if (this@HorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
62+
if (dataProvider.isDrawBarShadowEnabled) {
6363
shadowPaint.color = dataSet.barShadowColor
6464

65-
this@HorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
65+
dataProvider.barData?.let { barData ->
6666

6767
val barWidth = barData.barWidth
6868
val barWidthHalf = barWidth / 2.0f
@@ -103,16 +103,16 @@ open class HorizontalBarChartRenderer(
103103
val buffer = barBuffers[index]!!
104104
buffer.setPhases(phaseX, phaseY)
105105
buffer.setDataSet(index)
106-
buffer.inverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
107-
this@HorizontalBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
106+
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
107+
dataProvider.barData?.let { buffer.barWidth = it.barWidth }
108108

109109
buffer.feed(dataSet)
110110

111111
trans!!.pointValuesToPixel(buffer.buffer)
112112

113113
val isCustomFill = dataSet.fills.isNotEmpty()
114114
val isSingleColor = dataSet.colors.size == 1
115-
val isInverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
115+
val isInverted = dataProvider.isInverted(dataSet.axisDependency)
116116

117117
if (isSingleColor) {
118118
paintRender.color = dataSet.color
@@ -166,15 +166,15 @@ open class HorizontalBarChartRenderer(
166166
}
167167

168168
override fun drawValues(canvas: Canvas) {
169-
if (isDrawingValuesAllowed(this@HorizontalBarChartRenderer.dataProvider)) {
170-
val dataSets = this@HorizontalBarChartRenderer.dataProvider.barData?.dataSets
169+
if (isDrawingValuesAllowed(dataProvider)) {
170+
val dataSets = dataProvider.barData?.dataSets
171171

172172
val valueOffsetPlus = 5f.convertDpToPixel()
173173
var posOffset: Float
174174
var negOffset: Float
175-
val drawValueAboveBar = this@HorizontalBarChartRenderer.dataProvider.isDrawValueAboveBarEnabled
175+
val drawValueAboveBar = dataProvider.isDrawValueAboveBarEnabled
176176

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

187-
val isInverted = this@HorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
187+
val isInverted = dataProvider.isInverted(dataSet.axisDependency)
188188

189189
// apply the text-styling defined by the DataSet
190190
applyValueTextStyle(dataSet)
@@ -270,7 +270,7 @@ open class HorizontalBarChartRenderer(
270270

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

275275
var bufferIndex = 0
276276
var index = 0

‎chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import info.appdev.charting.utils.ViewPortHandler
1313
import info.appdev.charting.utils.convertDpToPixel
1414
import kotlin.math.min
1515

16-
@Suppress("unused")
1716
class RoundedBarChartRenderer(
1817
dataProvider: BarDataProvider,
1918
animator: ChartAnimator,
@@ -27,16 +26,16 @@ class RoundedBarChartRenderer(
2726

2827
override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
2928
initBuffers()
30-
val trans = this@RoundedBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
29+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
3130
barBorderPaint.color = dataSet.barBorderColor
3231
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
3332
shadowPaint.color = dataSet.barShadowColor
3433
val phaseX = animator.phaseX
3534
val phaseY = animator.phaseY
3635

37-
if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
36+
if (dataProvider.isDrawBarShadowEnabled) {
3837
shadowPaint.color = dataSet.barShadowColor
39-
this@RoundedBarChartRenderer.dataProvider.barData?.let { barData ->
38+
dataProvider.barData?.let { barData ->
4039
val barWidth = barData.barWidth
4140
val barWidthHalf = barWidth / 2.0f
4241
var x: Float
@@ -73,8 +72,8 @@ class RoundedBarChartRenderer(
7372
val buffer = barBuffers[index]!!
7473
buffer.setPhases(phaseX, phaseY)
7574
buffer.setDataSet(index)
76-
buffer.inverted = this@RoundedBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
77-
this@RoundedBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
75+
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
76+
dataProvider.barData?.let { buffer.barWidth = it.barWidth }
7877
buffer.feed(dataSet)
7978
trans!!.pointValuesToPixel(buffer.buffer)
8079

@@ -92,7 +91,7 @@ class RoundedBarChartRenderer(
9291
break
9392
}
9493

95-
if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
94+
if (dataProvider.isDrawBarShadowEnabled) {
9695
if (roundedShadowRadius > 0) {
9796
canvas.drawRoundRect(
9897
RectF(
@@ -142,7 +141,7 @@ class RoundedBarChartRenderer(
142141
break
143142
}
144143

145-
if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
144+
if (dataProvider.isDrawBarShadowEnabled) {
146145
if (roundedShadowRadius > 0) {
147146
canvas.drawRoundRect(
148147
RectF(
@@ -248,7 +247,7 @@ class RoundedBarChartRenderer(
248247
}
249248

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

253252
for (high in indices) {
254253
val set = barData.getDataSetByIndex(high.dataSetIndex)
@@ -263,7 +262,7 @@ class RoundedBarChartRenderer(
263262
continue
264263
}
265264

266-
val trans = this@RoundedBarChartRenderer.dataProvider.getTransformer(set.axisDependency)
265+
val trans = dataProvider.getTransformer(set.axisDependency)
267266

268267
paintHighlight.color = set.highLightColor
269268
paintHighlight.alpha = set.highLightAlpha
@@ -274,7 +273,7 @@ class RoundedBarChartRenderer(
274273
val y2: Float
275274

276275
if (isStack) {
277-
if (this@RoundedBarChartRenderer.dataProvider.isHighlightFullBarEnabled) {
276+
if (dataProvider.isHighlightFullBarEnabled) {
278277
y1 = barEntry.positiveSum
279278
y2 = -barEntry.negativeSum
280279
} else {

‎chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import info.appdev.charting.utils.ViewPortHandler
1111
import info.appdev.charting.utils.convertDpToPixel
1212
import kotlin.math.min
1313

14-
@Suppress("unused")
1514
class RoundedHorizontalBarChartRenderer(
1615
dataProvider: BarDataProvider,
1716
animator: ChartAnimator,
@@ -28,16 +27,16 @@ class RoundedHorizontalBarChartRenderer(
2827

2928
override fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
3029
initBuffers()
31-
val trans = this@RoundedHorizontalBarChartRenderer.dataProvider.getTransformer(dataSet.axisDependency)
30+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
3231
barBorderPaint.color = dataSet.barBorderColor
3332
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
3433
shadowPaint.color = dataSet.barShadowColor
3534
val phaseX = animator.phaseX
3635
val phaseY = animator.phaseY
3736

38-
if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
37+
if (dataProvider.isDrawBarShadowEnabled) {
3938
shadowPaint.color = dataSet.barShadowColor
40-
this@RoundedHorizontalBarChartRenderer.dataProvider.barData?.let { barData ->
39+
dataProvider.barData?.let { barData ->
4140
val barWidth = barData.barWidth
4241
val barWidthHalf = barWidth / 2.0f
4342
var x: Float
@@ -72,8 +71,8 @@ class RoundedHorizontalBarChartRenderer(
7271
val buffer = barBuffers[index]!!
7372
buffer.setPhases(phaseX, phaseY)
7473
buffer.setDataSet(index)
75-
buffer.inverted = this@RoundedHorizontalBarChartRenderer.dataProvider.isInverted(dataSet.axisDependency)
76-
this@RoundedHorizontalBarChartRenderer.dataProvider.barData?.let { buffer.barWidth = it.barWidth }
74+
buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
75+
dataProvider.barData?.let { buffer.barWidth = it.barWidth }
7776
buffer.feed(dataSet)
7877
trans!!.pointValuesToPixel(buffer.buffer)
7978

@@ -90,7 +89,7 @@ class RoundedHorizontalBarChartRenderer(
9089
break
9190
}
9291

93-
if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
92+
if (dataProvider.isDrawBarShadowEnabled) {
9493
if (roundedShadowRadius > 0) {
9594
canvas.drawRoundRect(
9695
RectF(
@@ -140,7 +139,7 @@ class RoundedHorizontalBarChartRenderer(
140139
break
141140
}
142141

143-
if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) {
142+
if (dataProvider.isDrawBarShadowEnabled) {
144143
if (roundedShadowRadius > 0) {
145144
canvas.drawRoundRect(
146145
RectF(

‎chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ open class XAxisRenderer(
4343
var minLocal = min
4444
var maxLocal = max
4545
if (viewPortHandler.contentWidth() > 10 && !viewPortHandler.isFullyZoomedOutX) {
46-
val p1 = this@XAxisRenderer.transformer!!.getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentTop())
47-
val p2 = this@XAxisRenderer.transformer!!.getValuesByTouchPoint(viewPortHandler.contentRight(), viewPortHandler.contentTop())
46+
val p1 = transformer!!.getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentTop())
47+
val p2 = transformer!!.getValuesByTouchPoint(viewPortHandler.contentRight(), viewPortHandler.contentTop())
4848

4949
if (inverted) {
5050
minLocal = p2.x.toFloat()
@@ -194,7 +194,7 @@ open class XAxisRenderer(
194194
}
195195
}
196196

197-
this@XAxisRenderer.transformer!!.pointValuesToPixel(positions)
197+
transformer!!.pointValuesToPixel(positions)
198198

199199
var i = 0
200200
while (i < positions.size) {
@@ -265,7 +265,7 @@ open class XAxisRenderer(
265265
}
266266
}
267267

268-
this@XAxisRenderer.transformer!!.pointValuesToPixel(positions)
268+
transformer!!.pointValuesToPixel(positions)
269269

270270
setupGridPaint()
271271

@@ -364,7 +364,7 @@ open class XAxisRenderer(
364364
position[0] = limitLine.limit
365365
position[1] = 0f
366366

367-
this@XAxisRenderer.transformer?.pointValuesToPixel(position)
367+
transformer?.pointValuesToPixel(position)
368368

369369
renderLimitLineLine(canvas, limitLine, position)
370370
renderLimitLineLabel(canvas, limitLine, position, 2f + limitLine.yOffset)

0 commit comments

Comments
 (0)