Skip to content

Commit e19f8d6

Browse files
hannesa2hannesa2
committed
Cosmetic
1 parent b76453f commit e19f8d6

File tree

6 files changed

+66
-68
lines changed

6 files changed

+66
-68
lines changed

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ protected class XBounds {
6666
/**
6767
* Calculates the minimum and maximum x values as well as the range between them.
6868
*/
69-
public void set(BarLineScatterCandleBubbleDataProvider chart, IBarLineScatterCandleBubbleDataSet dataSet) {
69+
public void set(BarLineScatterCandleBubbleDataProvider barLineScatterCandleBubbleDataProvider, IBarLineScatterCandleBubbleDataSet dataSet) {
7070
float phaseX = Math.max(0.f, Math.min(1.f, animator.getPhaseX()));
7171

72-
float low = chart.getLowestVisibleX();
73-
float high = chart.getHighestVisibleX();
72+
float low = barLineScatterCandleBubbleDataProvider.getLowestVisibleX();
73+
float high = barLineScatterCandleBubbleDataProvider.getHighestVisibleX();
7474

7575
Entry entryFrom = dataSet.getEntryForXValue(low, Float.NaN, DataSet.Rounding.DOWN);
7676
Entry entryTo = dataSet.getEntryForXValue(high, Float.NaN, DataSet.Rounding.UP);

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import kotlin.math.sqrt
1919
@Suppress("MemberVisibilityCanBePrivate")
2020
open class BubbleChartRenderer(
2121
@JvmField
22-
var chart: BubbleDataProvider, animator: ChartAnimator?,
22+
var dataProvider: BubbleDataProvider, animator: ChartAnimator?,
2323
viewPortHandler: ViewPortHandler?
2424
) : BarLineScatterCandleBubbleRenderer(animator, viewPortHandler) {
2525
override fun initBuffers() {
2626
}
2727

2828
override fun drawData(canvas: Canvas) {
29-
val bubbleData = chart.bubbleData
29+
val bubbleData = dataProvider.bubbleData
3030

3131
for (set in bubbleData.dataSets) {
3232
if (set.isVisible) drawDataSet(canvas, set)
@@ -45,11 +45,11 @@ open class BubbleChartRenderer(
4545
protected fun drawDataSet(canvas: Canvas, dataSet: IBubbleDataSet) {
4646
if (dataSet.entryCount < 1) return
4747

48-
val trans = chart.getTransformer(dataSet.axisDependency)
48+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
4949

5050
val phaseY = animator.phaseY
5151

52-
xBounds[chart] = dataSet
52+
xBounds[dataProvider] = dataSet
5353

5454
sizeBuffer[0] = 0f
5555
sizeBuffer[2] = 1f
@@ -88,10 +88,10 @@ open class BubbleChartRenderer(
8888
}
8989

9090
override fun drawValues(canvas: Canvas) {
91-
val bubbleData = chart.bubbleData ?: return
91+
val bubbleData = dataProvider.bubbleData ?: return
9292

9393
// if values are drawn
94-
if (isDrawingValuesAllowed(chart)) {
94+
if (isDrawingValuesAllowed(dataProvider)) {
9595
val dataSets = bubbleData.dataSets
9696

9797
val lineHeight = Utils.calcTextHeight(paintValues, "1").toFloat()
@@ -111,9 +111,9 @@ open class BubbleChartRenderer(
111111
val phaseX = max(0.0, min(1.0, animator.phaseX.toDouble())).toFloat()
112112
val phaseY = animator.phaseY
113113

114-
xBounds[chart] = dataSet
114+
xBounds[dataProvider] = dataSet
115115

116-
chart.getTransformer(dataSet.axisDependency)?.let { transformer ->
116+
dataProvider.getTransformer(dataSet.axisDependency)?.let { transformer ->
117117
val positions = transformer.generateTransformedValuesBubble(dataSet, phaseY, xBounds.min, xBounds.max)
118118

119119
val alpha = if (phaseX == 1f)
@@ -186,7 +186,7 @@ open class BubbleChartRenderer(
186186
}
187187

188188
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
189-
val bubbleData = chart.bubbleData
189+
val bubbleData = dataProvider.bubbleData
190190

191191
val phaseY = animator.phaseY
192192

@@ -201,7 +201,7 @@ open class BubbleChartRenderer(
201201

202202
if (!isInBoundsX(bubbleEntry, set)) continue
203203

204-
val trans = chart.getTransformer(set.axisDependency)
204+
val trans = dataProvider.getTransformer(set.axisDependency)
205205

206206
sizeBuffer[0] = 0f
207207
sizeBuffer[2] = 1f

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler
1313

1414
open class CandleStickChartRenderer(
1515
@JvmField
16-
var chart: CandleDataProvider, animator: ChartAnimator?,
16+
var dataProvider: CandleDataProvider, animator: ChartAnimator?,
1717
viewPortHandler: ViewPortHandler?
1818
) : LineScatterCandleRadarRenderer(animator, viewPortHandler) {
1919
private val shadowBuffers = FloatArray(8)
@@ -25,21 +25,21 @@ open class CandleStickChartRenderer(
2525
override fun initBuffers() = Unit
2626

2727
override fun drawData(canvas: Canvas) {
28-
val candleData = chart.candleData
28+
val candleData = dataProvider.candleData
2929

3030
for (set in candleData.dataSets) {
3131
if (set.isVisible) drawDataSet(canvas, set)
3232
}
3333
}
3434

3535
protected fun drawDataSet(canvas: Canvas, dataSet: ICandleDataSet) {
36-
val trans = chart.getTransformer(dataSet.axisDependency)
36+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
3737

3838
val phaseY = animator.phaseY
3939
val barSpace = dataSet.barSpace
4040
val showCandleBar = dataSet.showCandleBar
4141

42-
xBounds[chart] = dataSet
42+
xBounds[dataProvider] = dataSet
4343

4444
paintRender.strokeWidth = dataSet.shadowWidth
4545

@@ -205,8 +205,8 @@ open class CandleStickChartRenderer(
205205

206206
override fun drawValues(canvas: Canvas) {
207207
// if values are drawn
208-
if (isDrawingValuesAllowed(chart)) {
209-
val dataSets = chart.candleData.dataSets
208+
if (isDrawingValuesAllowed(dataProvider)) {
209+
val dataSets = dataProvider.candleData.dataSets
210210

211211
for (i in dataSets.indices) {
212212
val dataSet = dataSets[i]
@@ -220,9 +220,9 @@ open class CandleStickChartRenderer(
220220
// apply the text-styling defined by the DataSet
221221
applyValueTextStyle(dataSet)
222222

223-
val trans = chart.getTransformer(dataSet.axisDependency)
223+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
224224

225-
xBounds[chart] = dataSet
225+
xBounds[dataProvider] = dataSet
226226

227227
val positions = trans!!.generateTransformedValuesCandle(
228228
dataSet, animator.phaseX, animator.phaseY, xBounds.min, xBounds.max
@@ -285,7 +285,7 @@ open class CandleStickChartRenderer(
285285
override fun drawExtras(canvas: Canvas) = Unit
286286

287287
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
288-
val candleData = chart.candleData
288+
val candleData = dataProvider.candleData
289289

290290
for (high in indices) {
291291
val set = candleData.getDataSetByIndex(high.dataSetIndex)
@@ -300,7 +300,7 @@ open class CandleStickChartRenderer(
300300
val highValue = e.high * animator.phaseY
301301
val y = (lowValue + highValue) / 2f
302302

303-
val pix = chart.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, y)
303+
val pix = dataProvider.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, y)
304304

305305
high.setDraw(pix.x.toFloat(), pix.y.toFloat())
306306

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ open class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator,
7474
var data: ChartData<*>? = null
7575

7676
if (renderer is BarChartRenderer) data = renderer.chart.barData
77-
else if (renderer is LineChartRenderer) data = renderer.chart.lineData
78-
else if (renderer is CandleStickChartRenderer) data = renderer.chart.candleData
79-
else if (renderer is ScatterChartRenderer) data = renderer.chart.scatterData
80-
else if (renderer is BubbleChartRenderer) data = renderer.chart.bubbleData
77+
else if (renderer is LineChartRenderer) data = renderer.dataProvider.lineData
78+
else if (renderer is CandleStickChartRenderer) data = renderer.dataProvider.candleData
79+
else if (renderer is ScatterChartRenderer) data = renderer.dataProvider.scatterData
80+
else if (renderer is BubbleChartRenderer) data = renderer.dataProvider.bubbleData
8181

8282
val dataIndex = if (data == null)
8383
-1

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import java.lang.ref.WeakReference
2222
import kotlin.math.max
2323
import kotlin.math.min
2424

25-
class LineChartRenderer(
26-
@JvmField var chart: LineDataProvider, animator: ChartAnimator?,
25+
open class LineChartRenderer(
26+
@JvmField var dataProvider: LineDataProvider, animator: ChartAnimator?,
2727
viewPortHandler: ViewPortHandler?
2828
) : LineRadarRenderer(animator, viewPortHandler) {
2929
/**
@@ -74,7 +74,7 @@ class LineChartRenderer(
7474

7575
drawBitmapLocal.eraseColor(Color.TRANSPARENT)
7676

77-
val lineData = chart.lineData
77+
val lineData = dataProvider.lineData
7878

7979
for (set in lineData.dataSets) {
8080
if (set.isVisible) drawDataSet(canvas, set)
@@ -102,9 +102,9 @@ class LineChartRenderer(
102102
protected fun drawHorizontalBezier(dataSet: ILineDataSet) {
103103
val phaseY = animator.phaseY
104104

105-
val trans = chart.getTransformer(dataSet.axisDependency)
105+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
106106

107-
xBounds[chart] = dataSet
107+
xBounds[dataProvider] = dataSet
108108

109109
cubicPath.reset()
110110

@@ -152,9 +152,9 @@ class LineChartRenderer(
152152
protected fun drawCubicBezier(dataSet: ILineDataSet) {
153153
val phaseY = animator.phaseY
154154

155-
val trans = chart.getTransformer(dataSet.axisDependency)
155+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
156156

157-
xBounds[chart] = dataSet
157+
xBounds[dataProvider] = dataSet
158158

159159
val intensity = dataSet.cubicIntensity
160160

@@ -225,7 +225,7 @@ class LineChartRenderer(
225225
}
226226

227227
protected fun drawCubicFill(canvas: Canvas, dataSet: ILineDataSet, spline: Path, trans: Transformer, bounds: XBounds) {
228-
val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, chart)
228+
val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, dataProvider)
229229

230230
spline.lineTo(dataSet.getEntryForIndex(bounds.min + bounds.range).x, fillMin)
231231
spline.lineTo(dataSet.getEntryForIndex(bounds.min).x, fillMin)
@@ -250,7 +250,7 @@ class LineChartRenderer(
250250
val isDrawSteppedEnabled = dataSet.isDrawSteppedEnabled
251251
val pointsPerEntryPair = if (isDrawSteppedEnabled) 4 else 2
252252

253-
val trans = chart.getTransformer(dataSet.axisDependency)
253+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
254254

255255
val phaseY = animator.phaseY
256256

@@ -263,7 +263,7 @@ class LineChartRenderer(
263263
c
264264
}
265265

266-
xBounds[chart] = dataSet
266+
xBounds[dataProvider] = dataSet
267267

268268
// if drawing filled is enabled
269269
if (dataSet.isDrawFilledEnabled && entryCount > 0) {
@@ -447,7 +447,7 @@ class LineChartRenderer(
447447
* @return
448448
*/
449449
private fun generateFilledPath(dataSet: ILineDataSet, startIndex: Int, endIndex: Int, outputPath: Path) {
450-
val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, chart)
450+
val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, dataProvider)
451451
val phaseY = animator.phaseY
452452
val isDrawSteppedEnabled = dataSet.mode == LineDataSet.Mode.STEPPED
453453

@@ -485,8 +485,8 @@ class LineChartRenderer(
485485
}
486486

487487
override fun drawValues(canvas: Canvas) {
488-
if (isDrawingValuesAllowed(chart)) {
489-
val dataSets = chart.lineData.dataSets
488+
if (isDrawingValuesAllowed(dataProvider)) {
489+
val dataSets = dataProvider.lineData.dataSets
490490

491491
for (i in dataSets.indices) {
492492
val dataSet = dataSets[i]
@@ -500,14 +500,14 @@ class LineChartRenderer(
500500
// apply the text-styling defined by the DataSet
501501
applyValueTextStyle(dataSet)
502502

503-
val trans = chart.getTransformer(dataSet.axisDependency)
503+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
504504

505505
// make sure the values do not interfear with the circles
506506
var valOffset = (dataSet.circleRadius * 1.75f).toInt()
507507

508508
if (!dataSet.isDrawCirclesEnabled) valOffset = valOffset / 2
509509

510-
xBounds[chart] = dataSet
510+
xBounds[dataProvider] = dataSet
511511

512512
val positions = trans!!.generateTransformedValuesLine(
513513
dataSet, animator.phaseX, animator
@@ -588,7 +588,7 @@ class LineChartRenderer(
588588
mCirclesBuffer[0] = 0f
589589
mCirclesBuffer[1] = 0f
590590

591-
val dataSets = chart.lineData.dataSets
591+
val dataSets = dataProvider.lineData.dataSets
592592

593593
for (i in dataSets.indices) {
594594
val dataSet = dataSets[i]
@@ -597,9 +597,9 @@ class LineChartRenderer(
597597

598598
circlePaintInner.color = dataSet.circleHoleColor
599599

600-
val trans = chart.getTransformer(dataSet.axisDependency)
600+
val trans = dataProvider.getTransformer(dataSet.axisDependency)
601601

602-
xBounds[chart] = dataSet
602+
xBounds[dataProvider] = dataSet
603603

604604
val circleRadius = dataSet.circleRadius
605605
val circleHoleRadius = dataSet.circleHoleRadius
@@ -649,7 +649,7 @@ class LineChartRenderer(
649649
}
650650

651651
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
652-
val lineData = chart.lineData
652+
val lineData = dataProvider.lineData
653653

654654
for (high in indices) {
655655
val set = lineData.getDataSetByIndex(high.dataSetIndex)
@@ -660,7 +660,7 @@ class LineChartRenderer(
660660

661661
if (!isInBoundsX(e, set)) continue
662662

663-
val pix = chart.getTransformer(set.axisDependency)!!.getPixelForValues(
663+
val pix = dataProvider.getTransformer(set.axisDependency)!!.getPixelForValues(
664664
e.x, e.y * animator
665665
.phaseY
666666
)
@@ -673,7 +673,7 @@ class LineChartRenderer(
673673
}
674674

675675
/**
676-
* Releases the drawing bitmap. This should be called when [LineChart.onDetachedFromWindow].
676+
* Releases the drawing bitmap. This should be called when [com.github.mikephil.charting.charts.LineChart.onDetachedFromWindow].
677677
*/
678678
fun releaseBitmap() {
679679
bitmapCanvas?.setBitmap(null)

0 commit comments

Comments
 (0)