Skip to content

Commit dd84e09

Browse files
hannesa2hannesa2
committed
Cosmetic
1 parent b76453f commit dd84e09

File tree

5 files changed

+35
-37
lines changed

5 files changed

+35
-37
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 bubbleDataProvider: 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 = bubbleDataProvider.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 = bubbleDataProvider.getTransformer(dataSet.axisDependency)
4949

5050
val phaseY = animator.phaseY
5151

52-
xBounds[chart] = dataSet
52+
xBounds[bubbleDataProvider] = 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 = bubbleDataProvider.bubbleData ?: return
9292

9393
// if values are drawn
94-
if (isDrawingValuesAllowed(chart)) {
94+
if (isDrawingValuesAllowed(bubbleDataProvider)) {
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[bubbleDataProvider] = dataSet
115115

116-
chart.getTransformer(dataSet.axisDependency)?.let { transformer ->
116+
bubbleDataProvider.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 = bubbleDataProvider.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 = bubbleDataProvider.getTransformer(set.axisDependency)
205205

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ open class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator,
7676
if (renderer is BarChartRenderer) data = renderer.chart.barData
7777
else if (renderer is LineChartRenderer) data = renderer.chart.lineData
7878
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
79+
else if (renderer is ScatterChartRenderer) data = renderer.scatterDataProvider.scatterData
80+
else if (renderer is BubbleChartRenderer) data = renderer.bubbleDataProvider.bubbleData
8181

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

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

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

25-
class LineChartRenderer(
25+
open class LineChartRenderer(
2626
@JvmField var chart: LineDataProvider, animator: ChartAnimator?,
2727
viewPortHandler: ViewPortHandler?
2828
) : LineRadarRenderer(animator, viewPortHandler) {
@@ -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)

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import com.github.mikephil.charting.utils.ViewPortHandler
1212
import kotlin.math.ceil
1313
import kotlin.math.min
1414

15-
open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animator: ChartAnimator?, viewPortHandler: ViewPortHandler?) :
15+
open class ScatterChartRenderer(@JvmField var scatterDataProvider: ScatterDataProvider, animator: ChartAnimator?, viewPortHandler: ViewPortHandler?) :
1616
LineScatterCandleRadarRenderer(animator, viewPortHandler) {
1717
override fun initBuffers() {
1818
}
1919

2020
override fun drawData(canvas: Canvas) {
21-
val scatterData = chart.scatterData
21+
val scatterData = scatterDataProvider.scatterData
2222

2323
for (set in scatterData.dataSets) {
2424
if (set.isVisible) drawDataSet(canvas, set)
@@ -33,7 +33,7 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
3333

3434
val viewPortHandler = this.viewPortHandler
3535

36-
val trans = chart.getTransformer(dataSet.axisDependency)
36+
val trans = scatterDataProvider.getTransformer(dataSet.axisDependency)
3737

3838
val phaseY = animator.phaseY
3939

@@ -43,23 +43,23 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
4343
return
4444
}
4545

46-
val max = (min(
46+
val max = min(
4747
ceil((dataSet.entryCount.toFloat() * animator.phaseX).toDouble()),
4848
dataSet.entryCount.toFloat().toDouble()
49-
)).toInt()
49+
).toInt()
5050

5151
for (i in 0..<max) {
52-
val e = dataSet.getEntryForIndex(i)
52+
val entry = dataSet.getEntryForIndex(i)
5353

54-
pixelBuffer[0] = e.x
55-
pixelBuffer[1] = e.y * phaseY
54+
pixelBuffer[0] = entry.x
55+
pixelBuffer[1] = entry.y * phaseY
5656

5757
trans!!.pointValuesToPixel(pixelBuffer)
5858

59-
if (!viewPortHandler.isInBoundsRight(pixelBuffer[0])) break
59+
if (!viewPortHandler.isInBoundsRight(pixelBuffer[0]))
60+
break
6061

61-
if (!viewPortHandler.isInBoundsLeft(pixelBuffer[0])
62-
|| !viewPortHandler.isInBoundsY(pixelBuffer[1])
62+
if (!viewPortHandler.isInBoundsLeft(pixelBuffer[0]) || !viewPortHandler.isInBoundsY(pixelBuffer[1])
6363
) continue
6464

6565
paintRender.color = dataSet.getColorByIndex(i / 2)
@@ -72,12 +72,10 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
7272
}
7373

7474
override fun drawValues(canvas: Canvas) {
75-
// if values are drawn
75+
if (isDrawingValuesAllowed(scatterDataProvider)) {
76+
val dataSets = scatterDataProvider.scatterData.dataSets
7677

77-
if (isDrawingValuesAllowed(chart)) {
78-
val dataSets = chart.scatterData.dataSets
79-
80-
for (i in 0..<chart.scatterData.dataSetCount) {
78+
for (i in 0..<scatterDataProvider.scatterData.dataSetCount) {
8179
val dataSet = dataSets[i]
8280

8381
if (dataSet.entryCount == 0) {
@@ -90,9 +88,9 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
9088
// apply the text-styling defined by the DataSet
9189
applyValueTextStyle(dataSet)
9290

93-
xBounds[chart] = dataSet
91+
xBounds[scatterDataProvider] = dataSet
9492

95-
val positions = chart.getTransformer(dataSet.axisDependency)!!.generateTransformedValuesScatter(
93+
val positions = scatterDataProvider.getTransformer(dataSet.axisDependency)!!.generateTransformedValuesScatter(
9694
dataSet,
9795
animator.phaseX, animator.phaseY, xBounds.min, xBounds.max
9896
)
@@ -154,7 +152,7 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
154152
}
155153

156154
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
157-
val scatterData = chart.scatterData
155+
val scatterData = scatterDataProvider.scatterData
158156

159157
for (high in indices) {
160158
val set = scatterData.getDataSetByIndex(high.dataSetIndex)
@@ -165,7 +163,7 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
165163

166164
if (!isInBoundsX(e, set)) continue
167165

168-
val pix = chart.getTransformer(set.axisDependency)!!.getPixelForValues(
166+
val pix = scatterDataProvider.getTransformer(set.axisDependency)!!.getPixelForValues(
169167
e.x, e.y * animator
170168
.phaseY
171169
)

0 commit comments

Comments
 (0)