Skip to content

Commit 72a8f56

Browse files
hannesa2hannesa2
committed
Rename variable
1 parent de26321 commit 72a8f56

11 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
5757
override fun init() {
5858
super.init()
5959

60-
mRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
60+
dataRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
6161

6262
setHighlighter(BarHighlighter(this))
6363

‎chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
276276
canvas.clipRect(viewPortHandler.contentRect)
277277
}
278278

279-
mRenderer!!.drawData(canvas)
279+
dataRenderer!!.drawData(canvas)
280280

281281
if (!mXAxis.isDrawGridLinesBehindDataEnabled) {
282282
xAxisRenderer.renderGridLines(canvas)
@@ -292,13 +292,13 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
292292

293293
// if highlighting is enabled
294294
if (valuesToHighlight()) {
295-
mRenderer!!.drawHighlighted(canvas, highlighted!!)
295+
dataRenderer!!.drawHighlighted(canvas, highlighted!!)
296296
}
297297

298298
// Removes clipping rectangle
299299
canvas.restoreToCount(clipRestoreCount)
300300

301-
mRenderer!!.drawExtras(canvas)
301+
dataRenderer!!.drawExtras(canvas)
302302

303303
if (mXAxis.isEnabled && !mXAxis.isDrawLimitLinesBehindDataEnabled) {
304304
xAxisRenderer.renderLimitLines(canvas)
@@ -320,11 +320,11 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
320320
clipRestoreCount = canvas.save()
321321
canvas.clipRect(viewPortHandler.contentRect)
322322

323-
mRenderer?.drawValues(canvas)
323+
dataRenderer?.drawValues(canvas)
324324

325325
canvas.restoreToCount(clipRestoreCount)
326326
} else {
327-
mRenderer?.drawValues(canvas)
327+
dataRenderer?.drawValues(canvas)
328328
}
329329

330330
legendRenderer?.renderLegend(canvas)
@@ -376,7 +376,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
376376
}
377377
}
378378

379-
mRenderer?.initBuffers()
379+
dataRenderer?.initBuffers()
380380

381381
calcMinMax()
382382

‎chartLib/src/main/kotlin/info/appdev/charting/charts/BubbleChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ open class BubbleChart : BarLineChartBase<BubbleData>, BubbleDataProvider {
2222
override fun init() {
2323
super.init()
2424

25-
mRenderer = BubbleChartRenderer(this, mAnimator, viewPortHandler)
25+
dataRenderer = BubbleChartRenderer(this, mAnimator, viewPortHandler)
2626
}
2727

2828
override val bubbleData: BubbleData?

‎chartLib/src/main/kotlin/info/appdev/charting/charts/CandleStickChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ open class CandleStickChart : BarLineChartBase<CandleData>, CandleDataProvider {
1919
override fun init() {
2020
super.init()
2121

22-
mRenderer = CandleStickChartRenderer(this, mAnimator, viewPortHandler)
22+
dataRenderer = CandleStickChartRenderer(this, mAnimator, viewPortHandler)
2323

2424
xAxis.spaceMin = 0.5f
2525
xAxis.spaceMax = 0.5f

‎chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
148148
/**
149149
* object responsible for rendering the data
150150
*/
151-
protected var mRenderer: DataRenderer? = null
151+
protected var dataRenderer: DataRenderer? = null
152152

153153
var highlighter: IHighlighter? = null
154154
protected set
@@ -1063,13 +1063,13 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
10631063
/**
10641064
* Returns the Renderer object the chart uses for drawing data.
10651065
*/
1066-
get() = mRenderer
1066+
get() = dataRenderer
10671067
/**
10681068
* Sets a new DataRenderer object for the chart.
10691069
*/
10701070
set(renderer) {
10711071
if (renderer != null) {
1072-
mRenderer = renderer
1072+
dataRenderer = renderer
10731073
}
10741074
}
10751075

‎chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
3939
*/
4040
override var isDrawBarShadowEnabled: Boolean = false
4141

42-
protected var mDrawOrder: MutableList<DrawOrder>? = null
42+
protected var drawOrders: MutableList<DrawOrder>? = null
4343

4444
/**
4545
* enum that allows to specify the order in which the different data objects for the combined-chart are drawn
@@ -58,7 +58,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
5858
super.init()
5959

6060
// Default values are not ready here yet
61-
mDrawOrder = mutableListOf<DrawOrder>(
61+
drawOrders = mutableListOf<DrawOrder>(
6262
DrawOrder.BAR, DrawOrder.BUBBLE, DrawOrder.LINE, DrawOrder.CANDLE, DrawOrder.SCATTER
6363
)
6464

@@ -67,7 +67,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
6767
// Old default behaviour
6868
isHighlightFullBarEnabled = true
6969

70-
mRenderer = CombinedChartRenderer(this, mAnimator, viewPortHandler)
70+
dataRenderer = CombinedChartRenderer(this, mAnimator, viewPortHandler)
7171
}
7272

7373
override val combinedData: CombinedData?
@@ -76,8 +76,8 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
7676
override fun setData(data: CombinedData?) {
7777
super.setData(data)
7878
setHighlighter(CombinedHighlighter(this, this))
79-
(mRenderer as CombinedChartRenderer).createRenderers()
80-
mRenderer?.initBuffers()
79+
(dataRenderer as CombinedChartRenderer).createRenderers()
80+
dataRenderer?.initBuffers()
8181
}
8282

8383
/**
@@ -167,7 +167,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
167167
}
168168

169169
var drawOrder: MutableList<DrawOrder>?
170-
get() = mDrawOrder
170+
get() = drawOrders
171171
/**
172172
* Sets the order in which the provided data objects should be drawn. The
173173
* earlier you place them in the provided array, the further they will be in
@@ -178,7 +178,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
178178
if (order == null || order.isEmpty()) {
179179
return
180180
}
181-
mDrawOrder = order
181+
drawOrders = order
182182
}
183183

184184
/**

‎chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ open class HorizontalBarChart : BarChart {
4343
mLeftAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
4444
mRightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
4545

46-
mRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
46+
dataRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
4747
setHighlighter(HorizontalBarHighlighter(this))
4848

4949
axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)

‎chartLib/src/main/kotlin/info/appdev/charting/charts/LineChart.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open class LineChart : BarLineChartBase<LineData>, LineDataProvider {
1515

1616
override fun init() {
1717
super.init()
18-
mRenderer = LineChartRenderer(this, mAnimator, viewPortHandler)
18+
dataRenderer = LineChartRenderer(this, mAnimator, viewPortHandler)
1919
}
2020

2121
override var lineData: LineData
@@ -31,8 +31,8 @@ open class LineChart : BarLineChartBase<LineData>, LineDataProvider {
3131

3232
public override fun onDetachedFromWindow() {
3333
// releases the bitmap in the renderer to avoid oom error
34-
if (mRenderer != null && mRenderer is LineChartRenderer) {
35-
(mRenderer as LineChartRenderer).releaseBitmap()
34+
if (dataRenderer != null && dataRenderer is LineChartRenderer) {
35+
(dataRenderer as LineChartRenderer).releaseBitmap()
3636
}
3737
super.onDetachedFromWindow()
3838
}

‎chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ open class PieChart : PieRadarChartBase<PieData> {
143143
override fun init() {
144144
super.init()
145145

146-
mRenderer = PieChartRenderer(this, mAnimator, viewPortHandler)
146+
dataRenderer = PieChartRenderer(this, mAnimator, viewPortHandler)
147147
highlighter = PieHighlighter(this)
148148
}
149149

@@ -153,14 +153,14 @@ open class PieChart : PieRadarChartBase<PieData> {
153153
if (mData == null)
154154
return
155155

156-
mRenderer?.drawData(canvas)
156+
dataRenderer?.drawData(canvas)
157157

158158
if (valuesToHighlight())
159-
mRenderer?.drawHighlighted(canvas, highlighted!!)
159+
dataRenderer?.drawHighlighted(canvas, highlighted!!)
160160

161-
mRenderer?.drawExtras(canvas)
161+
dataRenderer?.drawExtras(canvas)
162162

163-
mRenderer?.drawValues(canvas)
163+
dataRenderer?.drawValues(canvas)
164164

165165
legendRenderer?.renderLegend(canvas)
166166

@@ -375,7 +375,7 @@ open class PieChart : PieRadarChartBase<PieData> {
375375
* (if enabled).
376376
*/
377377
fun setHoleColor(color: Int) {
378-
(mRenderer as PieChartRenderer).paintHole.color = color
378+
(dataRenderer as PieChartRenderer).paintHole.color = color
379379
}
380380

381381
/**
@@ -425,21 +425,21 @@ open class PieChart : PieRadarChartBase<PieData> {
425425
get() = getInstance(circleBox.centerX(), circleBox.centerY())
426426

427427
fun setCenterTextTypeface(t: Typeface?) {
428-
(mRenderer as PieChartRenderer).paintCenterText.typeface = t
428+
(dataRenderer as PieChartRenderer).paintCenterText.typeface = t
429429
}
430430

431431
/**
432432
* Sets the size of the center text of the PieChart in dp.
433433
*/
434434
fun setCenterTextSize(sizeDp: Float) {
435-
(mRenderer as PieChartRenderer).paintCenterText.textSize = sizeDp.convertDpToPixel()
435+
(dataRenderer as PieChartRenderer).paintCenterText.textSize = sizeDp.convertDpToPixel()
436436
}
437437

438438
/**
439439
* Sets the size of the center text of the PieChart in pixels.
440440
*/
441441
fun setCenterTextSizePixels(sizePixels: Float) {
442-
(mRenderer as PieChartRenderer).paintCenterText.textSize = sizePixels
442+
(dataRenderer as PieChartRenderer).paintCenterText.textSize = sizePixels
443443
}
444444

445445
/**
@@ -460,14 +460,14 @@ open class PieChart : PieRadarChartBase<PieData> {
460460
* Sets the color of the center text of the PieChart.
461461
*/
462462
fun setCenterTextColor(color: Int) {
463-
(mRenderer as PieChartRenderer).paintCenterText.color = color
463+
(dataRenderer as PieChartRenderer).paintCenterText.color = color
464464
}
465465

466466
/**
467467
* Sets the color the transparent-circle should have.
468468
*/
469469
fun setTransparentCircleColor(color: Int) {
470-
val p = (mRenderer as PieChartRenderer).paintTransparentCircle
470+
val p = (dataRenderer as PieChartRenderer).paintTransparentCircle
471471
val alpha = p.alpha
472472
p.color = color
473473
p.alpha = alpha
@@ -481,7 +481,7 @@ open class PieChart : PieRadarChartBase<PieData> {
481481
* @param alpha 0-255
482482
*/
483483
fun setTransparentCircleAlpha(alpha: Int) {
484-
(mRenderer as PieChartRenderer).paintTransparentCircle.alpha = alpha
484+
(dataRenderer as PieChartRenderer).paintTransparentCircle.alpha = alpha
485485
}
486486

487487
/**
@@ -506,23 +506,23 @@ open class PieChart : PieRadarChartBase<PieData> {
506506
*
507507
*/
508508
fun setEntryLabelColor(color: Int) {
509-
(mRenderer as PieChartRenderer).paintEntryLabels.color = color
509+
(dataRenderer as PieChartRenderer).paintEntryLabels.color = color
510510
}
511511

512512
/**
513513
* Sets a custom Typeface for the drawing of the entry labels.
514514
*
515515
*/
516516
fun setEntryLabelTypeface(tf: Typeface?) {
517-
(mRenderer as PieChartRenderer).paintEntryLabels.typeface = tf
517+
(dataRenderer as PieChartRenderer).paintEntryLabels.typeface = tf
518518
}
519519

520520
/**
521521
* Sets the size of the entry labels in dp. Default: 13dp
522522
*
523523
*/
524524
fun setEntryLabelTextSize(size: Float) {
525-
(mRenderer as PieChartRenderer).paintEntryLabels.textSize = size.convertDpToPixel()
525+
(dataRenderer as PieChartRenderer).paintEntryLabels.textSize = size.convertDpToPixel()
526526
}
527527

528528
/**
@@ -586,8 +586,8 @@ open class PieChart : PieRadarChartBase<PieData> {
586586

587587
override fun onDetachedFromWindow() {
588588
// releases the bitmap in the renderer to avoid oom error
589-
if (mRenderer != null && mRenderer is PieChartRenderer) {
590-
(mRenderer as PieChartRenderer).releaseBitmap()
589+
if (dataRenderer != null && dataRenderer is PieChartRenderer) {
590+
(dataRenderer as PieChartRenderer).releaseBitmap()
591591
}
592592
super.onDetachedFromWindow()
593593
}

‎chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
101101
mWebLineWidth = 1.5f.convertDpToPixel()
102102
mInnerWebLineWidth = 0.75f.convertDpToPixel()
103103

104-
mRenderer = RadarChartRenderer(this, mAnimator, viewPortHandler)
104+
dataRenderer = RadarChartRenderer(this, mAnimator, viewPortHandler)
105105
mYAxisRenderer = YAxisRendererRadarChart(viewPortHandler, mYAxis!!, this)
106106
mXAxisRenderer = XAxisRendererRadarChart(viewPortHandler, mXAxis, this)
107107

@@ -143,20 +143,20 @@ open class RadarChart : PieRadarChartBase<RadarData> {
143143
mXAxisRenderer!!.renderAxisLabels(canvas)
144144

145145
if (drawWeb)
146-
mRenderer?.drawExtras(canvas)
146+
dataRenderer?.drawExtras(canvas)
147147

148148
if (mYAxis!!.isEnabled && mYAxis!!.isDrawLimitLinesBehindDataEnabled) mYAxisRenderer!!.renderLimitLines(canvas)
149149

150-
mRenderer?.drawData(canvas)
150+
dataRenderer?.drawData(canvas)
151151

152152
if (valuesToHighlight())
153-
mRenderer?.drawHighlighted(canvas, highlighted!!)
153+
dataRenderer?.drawHighlighted(canvas, highlighted!!)
154154

155155
if (mYAxis!!.isEnabled && !mYAxis!!.isDrawLimitLinesBehindDataEnabled) mYAxisRenderer!!.renderLimitLines(canvas)
156156

157157
mYAxisRenderer!!.renderAxisLabels(canvas)
158158

159-
mRenderer?.drawValues(canvas)
159+
dataRenderer?.drawValues(canvas)
160160

161161
legendRenderer?.renderLegend(canvas)
162162

0 commit comments

Comments
 (0)