@@ -278,21 +278,22 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
278
278
limitLinePath.reset()
279
279
280
280
for (i in limitLines.indices) {
281
- val l = limitLines[i]
281
+ val limitLine = limitLines[i]
282
282
283
- if (! l.isEnabled) continue
283
+ if (! limitLine.isEnabled)
284
+ continue
284
285
285
286
c.withSave {
286
287
limitLineClippingRect.set(viewPortHandler.contentRect)
287
- limitLineClippingRect.inset(0f , - l .lineWidth)
288
+ limitLineClippingRect.inset(0f , - limitLine .lineWidth)
288
289
c.clipRect(limitLineClippingRect)
289
290
290
291
limitLinePaint.style = Paint .Style .STROKE
291
- limitLinePaint.color = l .lineColor
292
- limitLinePaint.strokeWidth = l .lineWidth
293
- limitLinePaint.setPathEffect(l .dashPathEffect)
292
+ limitLinePaint.color = limitLine .lineColor
293
+ limitLinePaint.strokeWidth = limitLine .lineWidth
294
+ limitLinePaint.setPathEffect(limitLine .dashPathEffect)
294
295
295
- pts[1 ] = l .limit
296
+ pts[1 ] = limitLine .limit
296
297
297
298
transformer?.pointValuesToPixel(pts)
298
299
@@ -303,66 +304,58 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
303
304
limitLinePath.reset()
304
305
305
306
// c.drawLines(pts, mLimitLinePaint);
306
- val label = l .label
307
+ val label = limitLine .label
307
308
308
309
// if drawing the limit-value label is enabled
309
310
if (label != null && label != " " ) {
310
- limitLinePaint.style = l .textStyle
311
+ limitLinePaint.style = limitLine .textStyle
311
312
limitLinePaint.setPathEffect(null )
312
- limitLinePaint.color = l .textColor
313
- limitLinePaint.setTypeface(l .typeface)
313
+ limitLinePaint.color = limitLine .textColor
314
+ limitLinePaint.setTypeface(limitLine .typeface)
314
315
limitLinePaint.strokeWidth = 0.5f
315
- limitLinePaint.textSize = l .textSize
316
+ limitLinePaint.textSize = limitLine .textSize
316
317
317
318
val labelLineHeight = Utils .calcTextHeight(limitLinePaint, label).toFloat()
318
- val xOffset = Utils .convertDpToPixel(4f ) + l .xOffset
319
- val yOffset = l .lineWidth + labelLineHeight + l .yOffset
319
+ val xOffset = Utils .convertDpToPixel(4f ) + limitLine .xOffset
320
+ val yOffset = limitLine .lineWidth + labelLineHeight + limitLine .yOffset
320
321
321
- val position = l .labelPosition
322
+ val position = limitLine .labelPosition
322
323
323
324
when (position) {
324
325
LimitLabelPosition .RIGHT_TOP -> {
325
326
limitLinePaint.textAlign = Align .RIGHT
326
- limitLinePaint.let {
327
- c.drawText(
328
- label,
329
- viewPortHandler.contentRight() - xOffset,
330
- pts[1 ] - yOffset + labelLineHeight, it
331
- )
332
- }
327
+ c.drawText(
328
+ label,
329
+ viewPortHandler.contentRight() - xOffset,
330
+ pts[1 ] - yOffset + labelLineHeight, limitLinePaint
331
+ )
333
332
}
334
333
335
334
LimitLabelPosition .RIGHT_BOTTOM -> {
336
- limitLinePaint.let {
337
- it.textAlign = Align .RIGHT
338
- c.drawText(
339
- label,
340
- viewPortHandler.contentRight() - xOffset,
341
- pts[1 ] + yOffset, it
342
- )
343
- }
335
+ limitLinePaint.textAlign = Align .RIGHT
336
+ c.drawText(
337
+ label,
338
+ viewPortHandler.contentRight() - xOffset,
339
+ pts[1 ] + yOffset, limitLinePaint
340
+ )
344
341
}
345
342
346
343
LimitLabelPosition .LEFT_TOP -> {
347
- limitLinePaint.let {
348
- it.textAlign = Align .LEFT
349
- c.drawText(
350
- label,
351
- viewPortHandler.contentLeft() + xOffset,
352
- pts[1 ] - yOffset + labelLineHeight, it
353
- )
354
- }
344
+ limitLinePaint.textAlign = Align .LEFT
345
+ c.drawText(
346
+ label,
347
+ viewPortHandler.contentLeft() + xOffset,
348
+ pts[1 ] - yOffset + labelLineHeight, limitLinePaint
349
+ )
355
350
}
356
351
357
352
else -> {
358
- limitLinePaint.let {
359
- it.textAlign = Align .LEFT
360
- c.drawText(
361
- label,
362
- viewPortHandler.offsetLeft() + xOffset,
363
- pts[1 ] + yOffset, it
364
- )
365
- }
353
+ limitLinePaint.textAlign = Align .LEFT
354
+ c.drawText(
355
+ label,
356
+ viewPortHandler.offsetLeft() + xOffset,
357
+ pts[1 ] + yOffset, limitLinePaint
358
+ )
366
359
}
367
360
}
368
361
}
0 commit comments