Skip to content

Commit 89383b6

Browse files
hannesa2hannesa2
authored
Merge pull request #439 from AppDevNext/RenameCanvas
Rename Canvas
2 parents 46dbba3 + 2ec594b commit 89383b6

23 files changed

+436
-454
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,30 +233,30 @@ abstract class AxisRenderer(
233233
/**
234234
* Draws the axis labels to the screen.
235235
*
236-
* @param c
236+
* @param canvas
237237
*/
238-
abstract fun renderAxisLabels(c: Canvas)
238+
abstract fun renderAxisLabels(canvas: Canvas)
239239

240240
/**
241241
* Draws the grid lines belonging to the axis.
242242
*
243-
* @param c
243+
* @param canvas
244244
*/
245-
abstract fun renderGridLines(c: Canvas)
245+
abstract fun renderGridLines(canvas: Canvas)
246246

247247
/**
248248
* Draws the line that goes alongside the axis.
249249
*
250-
* @param c
250+
* @param canvas
251251
*/
252-
abstract fun renderAxisLine(c: Canvas)
252+
abstract fun renderAxisLine(canvas: Canvas)
253253

254254
/**
255255
* Draws the LimitLines associated with this axis to the screen.
256256
*
257-
* @param c
257+
* @param canvas
258258
*/
259-
abstract fun renderLimitLines(c: Canvas)
259+
abstract fun renderLimitLines(canvas: Canvas)
260260

261261
/**
262262
* Sets the text color to use for the labels. Make sure to use

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ open class BarChartRenderer(
6969
}
7070
}
7171

72-
override fun drawData(c: Canvas) {
72+
override fun drawData(canvas: Canvas) {
7373
if (barBuffers.isEmpty()) {
7474
initBuffers()
7575
}
@@ -80,7 +80,7 @@ open class BarChartRenderer(
8080
val set = barData.getDataSetByIndex(i)
8181

8282
if (set.isVisible) {
83-
drawDataSet(c, set, i)
83+
drawDataSet(canvas, set, i)
8484
}
8585
}
8686
}
@@ -101,7 +101,7 @@ open class BarChartRenderer(
101101
barBorderPaint.style = Paint.Style.STROKE
102102
}
103103

104-
protected open fun drawDataSet(c: Canvas, dataSet: IBarDataSet, index: Int) {
104+
protected open fun drawDataSet(canvas: Canvas, dataSet: IBarDataSet, index: Int) {
105105
val trans = chart.getTransformer(dataSet.axisDependency)
106106

107107
barBorderPaint.color = dataSet.barBorderColor
@@ -147,9 +147,9 @@ open class BarChartRenderer(
147147
barShadowRectBuffer.bottom = viewPortHandler.contentBottom()
148148

149149
if (drawRoundedBars) {
150-
c.drawRoundRect(barShadowRectBuffer, roundedBarRadius, roundedBarRadius, shadowPaint)
150+
canvas.drawRoundRect(barShadowRectBuffer, roundedBarRadius, roundedBarRadius, shadowPaint)
151151
} else {
152-
c.drawRect(barShadowRectBuffer, shadowPaint)
152+
canvas.drawRect(barShadowRectBuffer, shadowPaint)
153153
}
154154
i++
155155
}
@@ -195,7 +195,7 @@ open class BarChartRenderer(
195195
if (isCustomFill) {
196196
dataSet.getFill(pos)
197197
.fillRect(
198-
c, paintRender,
198+
canvas, paintRender,
199199
buffer.buffer[j],
200200
buffer.buffer[j + 1],
201201
buffer.buffer[j + 2],
@@ -205,14 +205,14 @@ open class BarChartRenderer(
205205
)
206206
} else {
207207
if (drawRoundedBars) {
208-
c.drawRoundRect(
208+
canvas.drawRoundRect(
209209
RectF(
210210
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
211211
buffer.buffer[j + 3]
212212
), roundedBarRadius, roundedBarRadius, paintRender
213213
)
214214
} else {
215-
c.drawRect(
215+
canvas.drawRect(
216216
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
217217
buffer.buffer[j + 3], paintRender
218218
)
@@ -221,14 +221,14 @@ open class BarChartRenderer(
221221

222222
if (drawBorder) {
223223
if (drawRoundedBars) {
224-
c.drawRoundRect(
224+
canvas.drawRoundRect(
225225
RectF(
226226
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
227227
buffer.buffer[j + 3]
228228
), roundedBarRadius, roundedBarRadius, barBorderPaint
229229
)
230230
} else {
231-
c.drawRect(
231+
canvas.drawRect(
232232
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
233233
buffer.buffer[j + 3], barBorderPaint
234234
)
@@ -242,15 +242,13 @@ open class BarChartRenderer(
242242
protected open fun prepareBarHighlight(x: Float, y1: Float, y2: Float, barWidthHalf: Float, trans: Transformer) {
243243
val left = x - barWidthHalf
244244
val right = x + barWidthHalf
245-
val top = y1
246-
val bottom = y2
247245

248-
barRect[left, top, right] = bottom
246+
barRect[left, y1, right] = y2
249247

250248
trans.rectToPixelPhase(barRect, animator.phaseY)
251249
}
252250

253-
override fun drawValues(c: Canvas) {
251+
override fun drawValues(canvas: Canvas) {
254252
// if values are drawn
255253

256254
if (isDrawingValuesAllowed(chart)) {
@@ -317,7 +315,7 @@ open class BarChartRenderer(
317315

318316
if (dataSet.isDrawValuesEnabled) {
319317
drawValue(
320-
c, dataSet.valueFormatter, `val`, entry, i, x,
318+
canvas, dataSet.valueFormatter, `val`, entry, i, x,
321319
if (`val` >= 0) (buffer.buffer[j + 1] + posOffset) else (buffer.buffer[j + 3] + negOffset),
322320
dataSet.getValueTextColor(j / 4)
323321
)
@@ -333,7 +331,7 @@ open class BarChartRenderer(
333331
py += iconsOffset.y
334332

335333
Utils.drawImage(
336-
c,
334+
canvas,
337335
icon,
338336
px.toInt(),
339337
py.toInt(),
@@ -375,7 +373,7 @@ open class BarChartRenderer(
375373

376374
if (dataSet.isDrawValuesEnabled) {
377375
drawValue(
378-
c, dataSet.valueFormatter, entry.y, entry, i, x,
376+
canvas, dataSet.valueFormatter, entry.y, entry, i, x,
379377
buffer.buffer[bufferIndex + 1] +
380378
(if (entry.y >= 0) posOffset else negOffset),
381379
color
@@ -393,7 +391,7 @@ open class BarChartRenderer(
393391
py += iconsOffset.y
394392

395393
Utils.drawImage(
396-
c,
394+
canvas,
397395
icon,
398396
px.toInt(),
399397
py.toInt(),
@@ -457,7 +455,7 @@ open class BarChartRenderer(
457455

458456
if (dataSet.isDrawValuesEnabled) {
459457
drawValue(
460-
c,
458+
canvas,
461459
dataSet.valueFormatter,
462460
vals[k / 2],
463461
entry,
@@ -472,7 +470,7 @@ open class BarChartRenderer(
472470
val icon = entry.icon
473471

474472
Utils.drawImage(
475-
c,
473+
canvas,
476474
icon,
477475
(x + iconsOffset.x).toInt(),
478476
(y + iconsOffset.y).toInt(),
@@ -494,7 +492,7 @@ open class BarChartRenderer(
494492
}
495493
}
496494

497-
override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
495+
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
498496
val barData = chart.barData
499497

500498
for (high in indices) {
@@ -540,9 +538,9 @@ open class BarChartRenderer(
540538
setHighlightDrawPos(high, barRect)
541539

542540
if (drawRoundedBars) {
543-
c.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, paintHighlight)
541+
canvas.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, paintHighlight)
544542
} else {
545-
c.drawRect(barRect, paintHighlight)
543+
canvas.drawRect(barRect, paintHighlight)
546544
}
547545
}
548546
}
@@ -556,6 +554,6 @@ open class BarChartRenderer(
556554
high.setDraw(bar.centerX(), bar.top)
557555
}
558556

559-
override fun drawExtras(c: Canvas) {
557+
override fun drawExtras(canvas: Canvas) {
560558
}
561559
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected boolean isInBoundsX(Entry e, IBarLineScatterCandleBubbleDataSet set) {
4343

4444
float entryIndex = set.getEntryIndex(e);
4545

46-
if (e == null || entryIndex >= set.getEntryCount() * animator.getPhaseX()) {
46+
if (entryIndex >= set.getEntryCount() * animator.getPhaseX()) {
4747
return false;
4848
} else {
4949
return true;

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler
1313
import kotlin.math.abs
1414
import kotlin.math.max
1515
import kotlin.math.min
16+
import kotlin.math.roundToInt
1617
import kotlin.math.sqrt
1718

1819
@Suppress("MemberVisibilityCanBePrivate")
@@ -24,11 +25,11 @@ open class BubbleChartRenderer(
2425
override fun initBuffers() {
2526
}
2627

27-
override fun drawData(c: Canvas) {
28+
override fun drawData(canvas: Canvas) {
2829
val bubbleData = chart.bubbleData
2930

3031
for (set in bubbleData.dataSets) {
31-
if (set.isVisible) drawDataSet(c, set)
32+
if (set.isVisible) drawDataSet(canvas, set)
3233
}
3334
}
3435

@@ -41,7 +42,7 @@ open class BubbleChartRenderer(
4142
return shapeSize
4243
}
4344

44-
protected fun drawDataSet(c: Canvas, dataSet: IBubbleDataSet) {
45+
protected fun drawDataSet(canvas: Canvas, dataSet: IBubbleDataSet) {
4546
if (dataSet.entryCount < 1) return
4647

4748
val trans = chart.getTransformer(dataSet.axisDependency)
@@ -82,11 +83,11 @@ open class BubbleChartRenderer(
8283
val color = dataSet.getColor(j)
8384

8485
paintRender.color = color
85-
c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
86+
canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
8687
}
8788
}
8889

89-
override fun drawValues(c: Canvas) {
90+
override fun drawValues(canvas: Canvas) {
9091
val bubbleData = chart.bubbleData ?: return
9192

9293
// if values are drawn
@@ -128,7 +129,7 @@ open class BubbleChartRenderer(
128129
while (j < positions.size) {
129130
var valueTextColor = dataSet.getValueTextColor(j / 2 + xBounds.min)
130131
valueTextColor = Color.argb(
131-
Math.round(255f * alpha), Color.red(valueTextColor),
132+
(255f * alpha).roundToInt(), Color.red(valueTextColor),
132133
Color.green(valueTextColor), Color.blue(valueTextColor)
133134
)
134135

@@ -146,7 +147,7 @@ open class BubbleChartRenderer(
146147

147148
if (dataSet.isDrawValuesEnabled) {
148149
drawValue(
149-
c, dataSet.valueFormatter, entry.size, entry, i, x,
150+
canvas, dataSet.valueFormatter, entry.size, entry, i, x,
150151
y + (0.5f * lineHeight), valueTextColor
151152
)
152153
}
@@ -155,7 +156,7 @@ open class BubbleChartRenderer(
155156
val icon = entry.icon
156157

157158
Utils.drawImage(
158-
c,
159+
canvas,
159160
icon,
160161
(x + iconsOffset.x).toInt(),
161162
(y + iconsOffset.y).toInt(),
@@ -172,7 +173,7 @@ open class BubbleChartRenderer(
172173
}
173174
}
174175

175-
override fun drawExtras(c: Canvas) {
176+
override fun drawExtras(canvas: Canvas) {
176177
}
177178

178179
private val _hsvBuffer = FloatArray(3)
@@ -184,7 +185,7 @@ open class BubbleChartRenderer(
184185
paintHighlight.strokeWidth = Utils.convertDpToPixel(1.5f)
185186
}
186187

187-
override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
188+
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
188189
val bubbleData = chart.bubbleData
189190

190191
val phaseY = animator.phaseY
@@ -248,7 +249,7 @@ open class BubbleChartRenderer(
248249

249250
paintHighlight.color = color
250251
paintHighlight.strokeWidth = set.highlightCircleWidth
251-
c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintHighlight)
252+
canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintHighlight)
252253
}
253254
}
254255
}

0 commit comments

Comments
 (0)