Skip to content

Rename Canvas #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Dec 3, 2025
Merged

Rename Canvas #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,30 +233,30 @@ abstract class AxisRenderer(
/**
* Draws the axis labels to the screen.
*
* @param c
* @param canvas
*/
abstract fun renderAxisLabels(c: Canvas)
abstract fun renderAxisLabels(canvas: Canvas)

/**
* Draws the grid lines belonging to the axis.
*
* @param c
* @param canvas
*/
abstract fun renderGridLines(c: Canvas)
abstract fun renderGridLines(canvas: Canvas)

/**
* Draws the line that goes alongside the axis.
*
* @param c
* @param canvas
*/
abstract fun renderAxisLine(c: Canvas)
abstract fun renderAxisLine(canvas: Canvas)

/**
* Draws the LimitLines associated with this axis to the screen.
*
* @param c
* @param canvas
*/
abstract fun renderLimitLines(c: Canvas)
abstract fun renderLimitLines(canvas: Canvas)

/**
* Sets the text color to use for the labels. Make sure to use
Expand Down
46 changes: 22 additions & 24 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ open class BarChartRenderer(
}
}

override fun drawData(c: Canvas) {
override fun drawData(canvas: Canvas) {
if (barBuffers.isEmpty()) {
initBuffers()
}
Expand All @@ -80,7 +80,7 @@ open class BarChartRenderer(
val set = barData.getDataSetByIndex(i)

if (set.isVisible) {
drawDataSet(c, set, i)
drawDataSet(canvas, set, i)
}
}
}
Expand All @@ -101,7 +101,7 @@ open class BarChartRenderer(
barBorderPaint.style = Paint.Style.STROKE
}

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

barBorderPaint.color = dataSet.barBorderColor
Expand Down Expand Up @@ -147,9 +147,9 @@ open class BarChartRenderer(
barShadowRectBuffer.bottom = viewPortHandler.contentBottom()

if (drawRoundedBars) {
c.drawRoundRect(barShadowRectBuffer, roundedBarRadius, roundedBarRadius, shadowPaint)
canvas.drawRoundRect(barShadowRectBuffer, roundedBarRadius, roundedBarRadius, shadowPaint)
} else {
c.drawRect(barShadowRectBuffer, shadowPaint)
canvas.drawRect(barShadowRectBuffer, shadowPaint)
}
i++
}
Expand Down Expand Up @@ -195,7 +195,7 @@ open class BarChartRenderer(
if (isCustomFill) {
dataSet.getFill(pos)
.fillRect(
c, paintRender,
canvas, paintRender,
buffer.buffer[j],
buffer.buffer[j + 1],
buffer.buffer[j + 2],
Expand All @@ -205,14 +205,14 @@ open class BarChartRenderer(
)
} else {
if (drawRoundedBars) {
c.drawRoundRect(
canvas.drawRoundRect(
RectF(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3]
), roundedBarRadius, roundedBarRadius, paintRender
)
} else {
c.drawRect(
canvas.drawRect(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3], paintRender
)
Expand All @@ -221,14 +221,14 @@ open class BarChartRenderer(

if (drawBorder) {
if (drawRoundedBars) {
c.drawRoundRect(
canvas.drawRoundRect(
RectF(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3]
), roundedBarRadius, roundedBarRadius, barBorderPaint
)
} else {
c.drawRect(
canvas.drawRect(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3], barBorderPaint
)
Expand All @@ -242,15 +242,13 @@ open class BarChartRenderer(
protected open fun prepareBarHighlight(x: Float, y1: Float, y2: Float, barWidthHalf: Float, trans: Transformer) {
val left = x - barWidthHalf
val right = x + barWidthHalf
val top = y1
val bottom = y2

barRect[left, top, right] = bottom
barRect[left, y1, right] = y2

trans.rectToPixelPhase(barRect, animator.phaseY)
}

override fun drawValues(c: Canvas) {
override fun drawValues(canvas: Canvas) {
// if values are drawn

if (isDrawingValuesAllowed(chart)) {
Expand Down Expand Up @@ -317,7 +315,7 @@ open class BarChartRenderer(

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

Utils.drawImage(
c,
canvas,
icon,
px.toInt(),
py.toInt(),
Expand Down Expand Up @@ -375,7 +373,7 @@ open class BarChartRenderer(

if (dataSet.isDrawValuesEnabled) {
drawValue(
c, dataSet.valueFormatter, entry.y, entry, i, x,
canvas, dataSet.valueFormatter, entry.y, entry, i, x,
buffer.buffer[bufferIndex + 1] +
(if (entry.y >= 0) posOffset else negOffset),
color
Expand All @@ -393,7 +391,7 @@ open class BarChartRenderer(
py += iconsOffset.y

Utils.drawImage(
c,
canvas,
icon,
px.toInt(),
py.toInt(),
Expand Down Expand Up @@ -457,7 +455,7 @@ open class BarChartRenderer(

if (dataSet.isDrawValuesEnabled) {
drawValue(
c,
canvas,
dataSet.valueFormatter,
vals[k / 2],
entry,
Expand All @@ -472,7 +470,7 @@ open class BarChartRenderer(
val icon = entry.icon

Utils.drawImage(
c,
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
Expand All @@ -494,7 +492,7 @@ open class BarChartRenderer(
}
}

override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
val barData = chart.barData

for (high in indices) {
Expand Down Expand Up @@ -540,9 +538,9 @@ open class BarChartRenderer(
setHighlightDrawPos(high, barRect)

if (drawRoundedBars) {
c.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, paintHighlight)
canvas.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, paintHighlight)
} else {
c.drawRect(barRect, paintHighlight)
canvas.drawRect(barRect, paintHighlight)
}
}
}
Expand All @@ -556,6 +554,6 @@ open class BarChartRenderer(
high.setDraw(bar.centerX(), bar.top)
}

override fun drawExtras(c: Canvas) {
override fun drawExtras(canvas: Canvas) {
}
}
2 changes: 1 addition & 1 deletion ...c/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected boolean isInBoundsX(Entry e, IBarLineScatterCandleBubbleDataSet set) {

float entryIndex = set.getEntryIndex(e);

if (e == null || entryIndex >= set.getEntryCount() * animator.getPhaseX()) {
if (entryIndex >= set.getEntryCount() * animator.getPhaseX()) {
return false;
} else {
return true;
Expand Down
23 changes: 12 additions & 11 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToInt
import kotlin.math.sqrt

@Suppress("MemberVisibilityCanBePrivate")
Expand All @@ -24,11 +25,11 @@ open class BubbleChartRenderer(
override fun initBuffers() {
}

override fun drawData(c: Canvas) {
override fun drawData(canvas: Canvas) {
val bubbleData = chart.bubbleData

for (set in bubbleData.dataSets) {
if (set.isVisible) drawDataSet(c, set)
if (set.isVisible) drawDataSet(canvas, set)
}
}

Expand All @@ -41,7 +42,7 @@ open class BubbleChartRenderer(
return shapeSize
}

protected fun drawDataSet(c: Canvas, dataSet: IBubbleDataSet) {
protected fun drawDataSet(canvas: Canvas, dataSet: IBubbleDataSet) {
if (dataSet.entryCount < 1) return

val trans = chart.getTransformer(dataSet.axisDependency)
Expand Down Expand Up @@ -82,11 +83,11 @@ open class BubbleChartRenderer(
val color = dataSet.getColor(j)

paintRender.color = color
c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
}
}

override fun drawValues(c: Canvas) {
override fun drawValues(canvas: Canvas) {
val bubbleData = chart.bubbleData ?: return

// if values are drawn
Expand Down Expand Up @@ -128,7 +129,7 @@ open class BubbleChartRenderer(
while (j < positions.size) {
var valueTextColor = dataSet.getValueTextColor(j / 2 + xBounds.min)
valueTextColor = Color.argb(
Math.round(255f * alpha), Color.red(valueTextColor),
(255f * alpha).roundToInt(), Color.red(valueTextColor),
Color.green(valueTextColor), Color.blue(valueTextColor)
)

Expand All @@ -146,7 +147,7 @@ open class BubbleChartRenderer(

if (dataSet.isDrawValuesEnabled) {
drawValue(
c, dataSet.valueFormatter, entry.size, entry, i, x,
canvas, dataSet.valueFormatter, entry.size, entry, i, x,
y + (0.5f * lineHeight), valueTextColor
)
}
Expand All @@ -155,7 +156,7 @@ open class BubbleChartRenderer(
val icon = entry.icon

Utils.drawImage(
c,
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
Expand All @@ -172,7 +173,7 @@ open class BubbleChartRenderer(
}
}

override fun drawExtras(c: Canvas) {
override fun drawExtras(canvas: Canvas) {
}

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

override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
override fun drawHighlighted(canvas: Canvas, indices: Array<Highlight>) {
val bubbleData = chart.bubbleData

val phaseY = animator.phaseY
Expand Down Expand Up @@ -248,7 +249,7 @@ open class BubbleChartRenderer(

paintHighlight.color = color
paintHighlight.strokeWidth = set.highlightCircleWidth
c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintHighlight)
canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintHighlight)
}
}
}
Loading
Loading