diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt index 29f237822..f1c53282a 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt @@ -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(barData.dataSetCount).toMutableList() for (i in barBuffers.indices) { @@ -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() @@ -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 @@ -103,8 +103,8 @@ 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) @@ -112,7 +112,7 @@ open class HorizontalBarChartRenderer( 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 @@ -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.. + dataProvider.barData?.let { barData -> val barWidth = barData.barWidth val barWidthHalf = barWidth / 2.0f var x: Float @@ -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) @@ -92,7 +91,7 @@ class RoundedBarChartRenderer( break } - if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) { + if (dataProvider.isDrawBarShadowEnabled) { if (roundedShadowRadius > 0) { canvas.drawRoundRect( RectF( @@ -142,7 +141,7 @@ class RoundedBarChartRenderer( break } - if (this@RoundedBarChartRenderer.dataProvider.isDrawBarShadowEnabled) { + if (dataProvider.isDrawBarShadowEnabled) { if (roundedShadowRadius > 0) { canvas.drawRoundRect( RectF( @@ -248,7 +247,7 @@ class RoundedBarChartRenderer( } override fun drawHighlighted(canvas: Canvas, indices: Array) { - this@RoundedBarChartRenderer.dataProvider.barData?.let { barData -> + dataProvider.barData?.let { barData -> for (high in indices) { val set = barData.getDataSetByIndex(high.dataSetIndex) @@ -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 @@ -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 { diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt index 3c005136e..c3a2ed380 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt @@ -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, @@ -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 @@ -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) @@ -90,7 +89,7 @@ class RoundedHorizontalBarChartRenderer( break } - if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) { + if (dataProvider.isDrawBarShadowEnabled) { if (roundedShadowRadius > 0) { canvas.drawRoundRect( RectF( @@ -140,7 +139,7 @@ class RoundedHorizontalBarChartRenderer( break } - if (this@RoundedHorizontalBarChartRenderer.dataProvider.isDrawBarShadowEnabled) { + if (dataProvider.isDrawBarShadowEnabled) { if (roundedShadowRadius > 0) { canvas.drawRoundRect( RectF( diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt index fbd0df20b..9bb8da387 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt @@ -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() @@ -194,7 +194,7 @@ open class XAxisRenderer( } } - this@XAxisRenderer.transformer!!.pointValuesToPixel(positions) + transformer!!.pointValuesToPixel(positions) var i = 0 while (i < positions.size) { @@ -265,7 +265,7 @@ open class XAxisRenderer( } } - this@XAxisRenderer.transformer!!.pointValuesToPixel(positions) + transformer!!.pointValuesToPixel(positions) setupGridPaint() @@ -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)