Skip to content

Commit 48f3068

Browse files
hannesa2hannesa2
committed
Rename
1 parent e796e99 commit 48f3068

12 files changed

Lines changed: 82 additions & 83 deletions

File tree

‎MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class RadarChart : PieRadarChartBase<RadarData> {
188188
if (mData == null) {
189189
return false
190190
}
191-
return colorList.size == this.yAxis.mEntryCount
191+
return colorList.size == this.yAxis.entryCount
192192
}
193193

194194
var layerColorList: MutableList<Int>

‎MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ abstract class AxisBase : ComponentBase() {
4343
/**
4444
* the actual array of entries
4545
*/
46-
var mEntries: FloatArray = floatArrayOf()
46+
var entries: FloatArray = floatArrayOf()
4747

4848
/**
4949
* axis label entries only used for centered labels
5050
*/
51-
var mCenteredEntries: FloatArray = floatArrayOf()
51+
var centeredEntries: FloatArray = floatArrayOf()
5252

5353
/**
5454
* the number of entries the legend contains
5555
*/
5656
@JvmField
57-
var mEntryCount: Int = 0
57+
var entryCount: Int = 0
5858

5959
/**
6060
* the number of decimal digits to use
@@ -304,7 +304,7 @@ abstract class AxisBase : ComponentBase() {
304304
}
305305

306306
val isCenterAxisLabelsEnabled: Boolean
307-
get() = mCenterAxisLabels && mEntryCount > 0
307+
get() = mCenterAxisLabels && entryCount > 0
308308

309309
var axisLineWidth: Float
310310
/**
@@ -465,7 +465,7 @@ abstract class AxisBase : ComponentBase() {
465465
get() {
466466
var longest: String? = ""
467467

468-
for (i in mEntries.indices) {
468+
for (i in entries.indices) {
469469
val text = getFormattedLabel(i)
470470

471471
if (text != null && longest!!.length < text.length) longest = text
@@ -486,7 +486,7 @@ abstract class AxisBase : ComponentBase() {
486486
var longest: String? = ""
487487
val max = 0f
488488

489-
for (i in mEntries.indices) {
489+
for (i in entries.indices) {
490490
val text = getFormattedLabel(i)
491491
if (text != null) {
492492
val width = p.measureText(text)
@@ -500,10 +500,10 @@ abstract class AxisBase : ComponentBase() {
500500
}
501501

502502
fun getFormattedLabel(index: Int): String? {
503-
return if (index < 0 || index >= mEntries.size)
503+
return if (index < 0 || index >= entries.size)
504504
""
505505
else
506-
this.valueFormatter!!.getFormattedValue(mEntries[index], this)
506+
this.valueFormatter!!.getFormattedValue(entries[index], this)
507507
}
508508

509509
var valueFormatter: IAxisValueFormatter?

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ abstract class AxisRenderer(
119119
val range = abs((max - min).toDouble())
120120

121121
if (labelCount == 0 || range <= 0 || java.lang.Double.isInfinite(range)) {
122-
axis.mEntries = floatArrayOf()
123-
axis.mCenteredEntries = floatArrayOf()
124-
axis.mEntryCount = 0
122+
axis.entries = floatArrayOf()
123+
axis.centeredEntries = floatArrayOf()
124+
axis.entryCount = 0
125125
return
126126
}
127127

@@ -153,15 +153,15 @@ abstract class AxisRenderer(
153153
// If granularity is enabled, then do not allow the interval to go below specified granularity.
154154
if (axis.isGranularityEnabled) interval = if (interval < axis.granularity) axis.granularity.toDouble() else interval
155155

156-
axis.mEntryCount = labelCount
156+
axis.entryCount = labelCount
157157

158158
// Ensure stops contains at least numStops elements.
159-
axis.mEntries = FloatArray(labelCount)
159+
axis.entries = FloatArray(labelCount)
160160

161161
var v = min
162162

163163
for (i in 0..<labelCount) {
164-
axis.mEntries[i] = v
164+
axis.entries[i] = v
165165
v += interval.toFloat()
166166
}
167167

@@ -191,17 +191,17 @@ abstract class AxisRenderer(
191191
n = 1
192192
}
193193

194-
axis.mEntryCount = n
194+
axis.entryCount = n
195195

196-
axis.mEntries = FloatArray(n)
196+
axis.entries = FloatArray(n)
197197

198198
f = first
199199
var i = 0
200200
while (i < n) {
201201
if (f == 0.0) // Fix for negative zero case (Where value == -0.0, and 0.0 == -0.0)
202202
f = 0.0
203203

204-
axis.mEntries[i] = f.toFloat()
204+
axis.entries[i] = f.toFloat()
205205
f += interval
206206
++i
207207
}
@@ -215,14 +215,14 @@ abstract class AxisRenderer(
215215
}
216216

217217
if (axis.isCenterAxisLabelsEnabled) {
218-
if (axis.mCenteredEntries.size < n) {
219-
axis.mCenteredEntries = FloatArray(n)
218+
if (axis.centeredEntries.size < n) {
219+
axis.centeredEntries = FloatArray(n)
220220
}
221221

222222
val offset = interval.toFloat() / 2f
223223

224224
for (i in 0..<n) {
225-
axis.mCenteredEntries[i] = axis.mEntries[i] + offset
225+
axis.centeredEntries[i] = axis.entries[i] + offset
226226
}
227227
}
228228
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ open class RadarChartRenderer(
244244
webPaint.color = chart.webColorInner
245245
webPaint.alpha = chart.webAlpha
246246

247-
val labelCount = chart.yAxis.mEntryCount
247+
val labelCount = chart.yAxis.entryCount
248248

249249
val p1out = MPPointF.getInstance(0f, 0f)
250250
val p2out = MPPointF.getInstance(0f, 0f)
@@ -254,7 +254,7 @@ open class RadarChartRenderer(
254254
paint.color = chart.layerColorList[j]
255255
}
256256
for (i in 0..<chart.getData()!!.entryCount) {
257-
val r = (chart.yAxis.mEntries[j] - chart.yChartMin) * factor
257+
val r = (chart.yAxis.entries[j] - chart.yChartMin) * factor
258258

259259
Utils.getPosition(center, r, sliceAngle * i + rotationAngle, p1out)
260260
Utils.getPosition(center, r, sliceAngle * (i + 1) + rotationAngle, p2out)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import kotlin.math.min
1717
class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) :
1818
BarChartRenderer(chart, animator, viewPortHandler) {
1919
private val mBarShadowRectBuffer = RectF()
20-
private val mRadius = 20f
20+
private val radius = 20f
2121
private var roundedShadowRadius = 0f
2222
private var roundedPositiveDataSetRadius = 0f
2323
private var roundedNegativeDataSetRadius = 0f
@@ -305,7 +305,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
305305
RectF(
306306
barRect.left, barRect.top, barRect.right,
307307
barRect.bottom
308-
), mRadius, mRadius, tl = true, tr = true, br = true, bl = true
308+
), radius, radius, tl = true, tr = true, br = true, bl = true
309309
)
310310

311311
canvas.drawPath(path2, paintHighlight)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import kotlin.math.min
1515

1616
open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) :
1717
LineScatterCandleRadarRenderer(animator, viewPortHandler) {
18-
override fun initBuffers() {
19-
}
18+
override fun initBuffers() = Unit
2019

2120
override fun drawData(canvas: Canvas) {
2221
val scatterData = dataProvider.scatterData

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@ open class XAxisRenderer(
173173
i += 2
174174
}
175175
} else {
176-
positions = FloatArray(xAxis.mEntryCount * 2)
176+
positions = FloatArray(xAxis.entryCount * 2)
177177
var i = 0
178178
while (i < positions.size) {
179179
// only fill x values
180180
if (centeringEnabled) {
181-
positions[i] = xAxis.mCenteredEntries[i / 2]
181+
positions[i] = xAxis.centeredEntries[i / 2]
182182
} else {
183-
positions[i] = xAxis.mEntries[i / 2]
183+
positions[i] = xAxis.entries[i / 2]
184184
}
185185
i += 2
186186
}
@@ -196,12 +196,12 @@ open class XAxisRenderer(
196196
val label = if (xAxis.isShowSpecificPositions)
197197
xAxis.valueFormatter?.getFormattedValue(xAxis.specificPositions[i / 2], xAxis)
198198
else
199-
xAxis.valueFormatter?.getFormattedValue(xAxis.mEntries[i / 2], xAxis)
199+
xAxis.valueFormatter?.getFormattedValue(xAxis.entries[i / 2], xAxis)
200200

201201
if (xAxis.isAvoidFirstLastClippingEnabled) {
202202
// avoid clipping of the last
203203

204-
if (i / 2 == xAxis.mEntryCount - 1 && xAxis.mEntryCount > 1) {
204+
if (i / 2 == xAxis.entryCount - 1 && xAxis.entryCount > 1) {
205205
val width = Utils.calcTextWidth(paintAxisLabels, label).toFloat()
206206

207207
if (width > viewPortHandler.offsetRight() * 2
@@ -225,23 +225,23 @@ open class XAxisRenderer(
225225
Utils.drawXAxisValue(canvas, formattedLabel, x, y, paintAxisLabels, anchor, angleDegrees)
226226
}
227227

228-
protected open var mRenderGridLinesPath: Path = Path()
229-
protected open var mRenderGridLinesBuffer: FloatArray = FloatArray(2)
228+
protected open var renderGridLinesPath: Path = Path()
229+
protected open var renderGridLinesBuffer: FloatArray = FloatArray(2)
230230
override fun renderGridLines(canvas: Canvas) {
231231
if (!xAxis.isDrawGridLinesEnabled || !xAxis.isEnabled)
232232
return
233233

234234
canvas.withClip(gridClippingRect!!) {
235235
if (axis.isShowSpecificPositions) {
236-
if (mRenderGridLinesBuffer.size != axis.specificPositions.size * 2) {
237-
mRenderGridLinesBuffer = FloatArray(xAxis.specificPositions.size * 2)
236+
if (renderGridLinesBuffer.size != axis.specificPositions.size * 2) {
237+
renderGridLinesBuffer = FloatArray(xAxis.specificPositions.size * 2)
238238
}
239239
} else {
240-
if (mRenderGridLinesBuffer.size != axis.mEntryCount * 2) {
241-
mRenderGridLinesBuffer = FloatArray(xAxis.mEntryCount * 2)
240+
if (renderGridLinesBuffer.size != axis.entryCount * 2) {
241+
renderGridLinesBuffer = FloatArray(xAxis.entryCount * 2)
242242
}
243243
}
244-
val positions = mRenderGridLinesBuffer
244+
val positions = renderGridLinesBuffer
245245

246246
run {
247247
var i = 0
@@ -250,8 +250,8 @@ open class XAxisRenderer(
250250
positions[i] = xAxis.specificPositions[i / 2]
251251
positions[i + 1] = xAxis.specificPositions[i / 2]
252252
} else {
253-
positions[i] = xAxis.mEntries[i / 2]
254-
positions[i + 1] = xAxis.mEntries[i / 2]
253+
positions[i] = xAxis.entries[i / 2]
254+
positions[i + 1] = xAxis.entries[i / 2]
255255
}
256256
i += 2
257257
}
@@ -261,7 +261,7 @@ open class XAxisRenderer(
261261

262262
setupGridPaint()
263263

264-
val gridLinePath = mRenderGridLinesPath
264+
val gridLinePath = renderGridLinesPath
265265
gridLinePath.reset()
266266

267267
var i = 0

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ open class XAxisRendererHorizontalBarChart(
128128
val labelRotationAngleDegrees = xAxis.labelRotationAngle
129129
val centeringEnabled = xAxis.isCenterAxisLabelsEnabled
130130

131-
val positions = FloatArray(xAxis.mEntryCount * 2)
131+
val positions = FloatArray(xAxis.entryCount * 2)
132132

133133
run {
134134
var i = 0
135135
while (i < positions.size) {
136136
// only fill x values
137137
if (centeringEnabled) {
138-
positions[i + 1] = xAxis.mCenteredEntries[i / 2]
138+
positions[i + 1] = xAxis.centeredEntries[i / 2]
139139
} else {
140-
positions[i + 1] = xAxis.mEntries[i / 2]
140+
positions[i + 1] = xAxis.entries[i / 2]
141141
}
142142
i += 2
143143
}
@@ -150,7 +150,7 @@ open class XAxisRendererHorizontalBarChart(
150150
val y = positions[i + 1]
151151

152152
if (viewPortHandler.isInBoundsY(y)) {
153-
val label = xAxis.valueFormatter?.getFormattedValue(xAxis.mEntries[i / 2], xAxis)
153+
val label = xAxis.valueFormatter?.getFormattedValue(xAxis.entries[i / 2], xAxis)
154154
drawLabel(canvas, label, pos, y, anchor, labelRotationAngleDegrees)
155155
}
156156
i += 2

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
110110
} else {
111111
from = if (yAxis.isDrawBottomYLabelEntryEnabled) 0 else 1
112112
to = if (yAxis.isDrawTopYLabelEntryEnabled)
113-
yAxis.mEntryCount
113+
yAxis.entryCount
114114
else
115-
(yAxis.mEntryCount - 1)
115+
(yAxis.entryCount - 1)
116116
}
117117

118118
val xOffset = yAxis.labelXOffset
@@ -199,8 +199,8 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
199199
mGetTransformedPositionsBuffer = FloatArray(yAxis.specificPositions.size * 2)
200200
}
201201
} else {
202-
if (mGetTransformedPositionsBuffer.size != yAxis.mEntryCount * 2) {
203-
mGetTransformedPositionsBuffer = FloatArray(yAxis.mEntryCount * 2)
202+
if (mGetTransformedPositionsBuffer.size != yAxis.entryCount * 2) {
203+
mGetTransformedPositionsBuffer = FloatArray(yAxis.entryCount * 2)
204204
}
205205
}
206206
val positions = mGetTransformedPositionsBuffer
@@ -211,7 +211,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
211211
if (yAxis.isShowSpecificPositions) {
212212
positions[i + 1] = yAxis.specificPositions[i / 2]
213213
} else {
214-
positions[i + 1] = yAxis.mEntries[i / 2]
214+
positions[i + 1] = yAxis.entries[i / 2]
215215
}
216216
i += 2
217217
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ open class YAxisRendererHorizontalBarChart(
133133

134134
val from = if (yAxis.isDrawBottomYLabelEntryEnabled) 0 else 1
135135
val to = if (yAxis.isDrawTopYLabelEntryEnabled)
136-
yAxis.mEntryCount
136+
yAxis.entryCount
137137
else
138-
(yAxis.mEntryCount - 1)
138+
(yAxis.entryCount - 1)
139139

140140
val xOffset = yAxis.labelXOffset
141141

@@ -155,15 +155,15 @@ open class YAxisRendererHorizontalBarChart(
155155

156156
override val transformedPositions: FloatArray
157157
get() {
158-
if (mGetTransformedPositionsBuffer.size != yAxis.mEntryCount * 2) {
159-
mGetTransformedPositionsBuffer = FloatArray(yAxis.mEntryCount * 2)
158+
if (mGetTransformedPositionsBuffer.size != yAxis.entryCount * 2) {
159+
mGetTransformedPositionsBuffer = FloatArray(yAxis.entryCount * 2)
160160
}
161161
val positions = mGetTransformedPositionsBuffer
162162

163163
var i = 0
164164
while (i < positions.size) {
165165
// only fill x values, y values are not needed for x-labels
166-
positions[i] = yAxis.mEntries[i / 2]
166+
positions[i] = yAxis.entries[i / 2]
167167
i += 2
168168
}
169169

0 commit comments

Comments
 (0)