Skip to content

Cosmetic #355

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
merged 1 commit into from
Apr 15, 2025
+35 −35
Merged

Cosmetic #355

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
2 changes: 1 addition & 1 deletion 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 @@ -70,7 +70,7 @@ abstract class AxisRenderer(
* paint used for the limit lines
*/
@JvmField
protected var limitLinePaint: Paint? = null
protected var limitLinePaint: Paint

init {
paintAxisLabels = Paint(Paint.ANTI_ALIAS_FLAG)
Expand Down
36 changes: 18 additions & 18 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,24 +353,24 @@ open class XAxisRenderer(
mLimitLinePath.moveTo(mLimitLineSegmentsBuffer[0], mLimitLineSegmentsBuffer[1])
mLimitLinePath.lineTo(mLimitLineSegmentsBuffer[2], mLimitLineSegmentsBuffer[3])

limitLinePaint!!.style = Paint.Style.STROKE
limitLinePaint!!.color = limitLine.lineColor
limitLinePaint!!.strokeWidth = limitLine.lineWidth
limitLinePaint!!.setPathEffect(limitLine.dashPathEffect)
limitLinePaint.style = Paint.Style.STROKE
limitLinePaint.color = limitLine.lineColor
limitLinePaint.strokeWidth = limitLine.lineWidth
limitLinePaint.setPathEffect(limitLine.dashPathEffect)

c.drawPath(mLimitLinePath, limitLinePaint!!)
c.drawPath(mLimitLinePath, limitLinePaint)
}

fun renderLimitLineLabel(c: Canvas, limitLine: LimitLine, position: FloatArray, yOffset: Float) {
val label = limitLine.label

// if drawing the limit-value label is enabled
if (label != null && label != "") {
limitLinePaint!!.style = limitLine.textStyle
limitLinePaint!!.setPathEffect(null)
limitLinePaint!!.color = limitLine.textColor
limitLinePaint!!.strokeWidth = 0.5f
limitLinePaint!!.textSize = limitLine.textSize
limitLinePaint.style = limitLine.textStyle
limitLinePaint.setPathEffect(null)
limitLinePaint.color = limitLine.textColor
limitLinePaint.strokeWidth = 0.5f
limitLinePaint.textSize = limitLine.textSize


val xOffset = limitLine.lineWidth + limitLine.xOffset
Expand All @@ -379,24 +379,24 @@ open class XAxisRenderer(

if (labelPosition == LimitLabelPosition.RIGHT_TOP) {
val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
limitLinePaint!!.textAlign = Align.LEFT
limitLinePaint.textAlign = Align.LEFT
c.drawText(
label, position[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
limitLinePaint!!
limitLinePaint
)
} else if (labelPosition == LimitLabelPosition.RIGHT_BOTTOM) {
limitLinePaint!!.textAlign = Align.LEFT
c.drawText(label, position[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
limitLinePaint.textAlign = Align.LEFT
c.drawText(label, position[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
} else if (labelPosition == LimitLabelPosition.LEFT_TOP) {
limitLinePaint!!.textAlign = Align.RIGHT
limitLinePaint.textAlign = Align.RIGHT
val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
c.drawText(
label, position[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
limitLinePaint!!
limitLinePaint
)
} else {
limitLinePaint!!.textAlign = Align.RIGHT
c.drawText(label, position[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
limitLinePaint.textAlign = Align.RIGHT
c.drawText(label, position[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
}
}
}
Expand Down
32 changes: 16 additions & 16 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
limitLineClippingRect.inset(0f, -l.lineWidth)
c.clipRect(limitLineClippingRect)

limitLinePaint?.style = Paint.Style.STROKE
limitLinePaint?.color = l.lineColor
limitLinePaint?.strokeWidth = l.lineWidth
limitLinePaint?.setPathEffect(l.dashPathEffect)
limitLinePaint.style = Paint.Style.STROKE
limitLinePaint.color = l.lineColor
limitLinePaint.strokeWidth = l.lineWidth
limitLinePaint.setPathEffect(l.dashPathEffect)

pts[1] = l.limit

Expand All @@ -304,20 +304,20 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
limitLinePath.moveTo(viewPortHandler.contentLeft(), pts[1])
limitLinePath.lineTo(viewPortHandler.contentRight(), pts[1])

limitLinePaint?.let { c.drawPath(limitLinePath, it) }
c.drawPath(limitLinePath, limitLinePaint)
limitLinePath.reset()

// c.drawLines(pts, mLimitLinePaint);
val label = l.label

// if drawing the limit-value label is enabled
if (label != null && label != "") {
limitLinePaint?.style = l.textStyle
limitLinePaint?.setPathEffect(null)
limitLinePaint?.color = l.textColor
limitLinePaint?.setTypeface(l.typeface)
limitLinePaint?.strokeWidth = 0.5f
limitLinePaint?.textSize = l.textSize
limitLinePaint.style = l.textStyle
limitLinePaint.setPathEffect(null)
limitLinePaint.color = l.textColor
limitLinePaint.setTypeface(l.typeface)
limitLinePaint.strokeWidth = 0.5f
limitLinePaint.textSize = l.textSize

val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
val xOffset = Utils.convertDpToPixel(4f) + l.xOffset
Expand All @@ -326,16 +326,16 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
val position = l.labelPosition

if (position == LimitLabelPosition.RIGHT_TOP) {
limitLinePaint?.textAlign = Align.RIGHT
limitLinePaint?.let {
limitLinePaint.textAlign = Align.RIGHT
limitLinePaint.let {
c.drawText(
label,
viewPortHandler.contentRight() - xOffset,
pts[1] - yOffset + labelLineHeight, it
)
}
} else if (position == LimitLabelPosition.RIGHT_BOTTOM) {
limitLinePaint?.let {
limitLinePaint.let {
it.textAlign = Align.RIGHT
c.drawText(
label,
Expand All @@ -344,7 +344,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
)
}
} else if (position == LimitLabelPosition.LEFT_TOP) {
limitLinePaint?.let {
limitLinePaint.let {
it.textAlign = Align.LEFT
c.drawText(
label,
Expand All @@ -353,7 +353,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
)
}
} else {
limitLinePaint?.let {
limitLinePaint.let {
it.textAlign = Align.LEFT
c.drawText(
label,
Expand Down
Loading