Skip to content

Commit f5a9298

Browse files
hannesa2hannesa2
committed
Kotlin getNormalizedAngle
1 parent f2d383a commit f5a9298

File tree

11 files changed

+90
-215
lines changed

11 files changed

+90
-215
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.github.mikephil.charting.renderer.RadarChartRenderer;
1515
import com.github.mikephil.charting.renderer.XAxisRendererRadarChart;
1616
import com.github.mikephil.charting.renderer.YAxisRendererRadarChart;
17-
import com.github.mikephil.charting.utils.Utils;
1817
import com.github.mikephil.charting.utils.UtilsKtKt;
1918

2019
import java.util.List;
@@ -207,7 +206,7 @@ public List<Integer> getLayerColorList() {
207206
public int getIndexForAngle(float angle) {
208207

209208
// take the current angle of the chart into consideration
210-
float a = Utils.getNormalizedAngle(angle - getRotationAngle());
209+
float a = UtilsKtKt.getNormalizedAngle(angle - getRotationAngle());
211210

212211
float sliceangle = getSliceAngle();
213212

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.github.mikephil.charting.utils.ColorTemplate
66
import com.github.mikephil.charting.utils.FSize
77
import com.github.mikephil.charting.utils.Utils
88
import com.github.mikephil.charting.utils.ViewPortHandler
9+
import com.github.mikephil.charting.utils.calcTextSize
910
import com.github.mikephil.charting.utils.convertDpToPixel
1011
import java.lang.Float
1112
import kotlin.Array
@@ -463,7 +464,7 @@ class Legend() : ComponentBase() {
463464

464465
// grouped forms have null labels
465466
if (label != null) {
466-
calculatedLabelSizes.add(Utils.calcTextSize(labelpaint, label))
467+
calculatedLabelSizes.add(labelpaint.calcTextSize(label))
467468
requiredWidth += if (drawingForm) formToTextSpace + formSize else 0f
468469
requiredWidth += calculatedLabelSizes.get(i)!!.width
469470
} else {

‎MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import com.github.mikephil.charting.formatter.IValueFormatter
1111
import com.github.mikephil.charting.interfaces.datasets.IDataSet
1212
import com.github.mikephil.charting.utils.ColorTemplate
1313
import com.github.mikephil.charting.utils.MPPointF
14-
import com.github.mikephil.charting.utils.Utils
1514
import com.github.mikephil.charting.utils.convertDpToPixel
15+
import com.github.mikephil.charting.utils.getDefaultValueFormatter
1616

1717
/**
1818
* This is the base dataset of all DataSets. It's purpose is to implement critical methods
@@ -255,7 +255,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
255255

256256
override var valueFormatter: IValueFormatter
257257
get() = if (needsFormatter())
258-
Utils.getDefaultValueFormatter()
258+
getDefaultValueFormatter()
259259
else
260260
mValueFormatter!!
261261
set(value) {

‎MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.github.mikephil.charting.charts.RadarChart
44
import com.github.mikephil.charting.data.Entry
55
import com.github.mikephil.charting.interfaces.datasets.IDataSet
66
import com.github.mikephil.charting.utils.MPPointF
7-
import com.github.mikephil.charting.utils.Utils
7+
import com.github.mikephil.charting.utils.getPosition
88
import kotlin.math.abs
99

1010
open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>(chart) {
@@ -43,17 +43,17 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
4343
val sliceAngle = chartPieRadar.sliceAngle
4444
val factor = chartPieRadar.getFactor()
4545

46-
val pOut = MPPointF.getInstance(0f, 0f)
46+
var pOut: MPPointF
4747
for (i in 0..<chartPieRadar.data!!.getDataSetCount()) {
4848
val dataSet: IDataSet<*> = chartPieRadar.data!!.getDataSetByIndex(i)
4949

5050
val entry: Entry? = dataSet.getEntryForIndex(index)
5151

5252
val y = (entry!!.y - chartPieRadar.yChartMin)
5353

54-
Utils.getPosition(
55-
chartPieRadar.centerOffsets, y * factor * phaseY,
56-
sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut
54+
pOut = chartPieRadar.centerOffsets.getPosition(
55+
y * factor * phaseY,
56+
sliceAngle * index * phaseX + chartPieRadar.rotationAngle
5757
)
5858

5959
mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.utils.MPPointF
1414
import com.github.mikephil.charting.utils.Utils
1515
import com.github.mikephil.charting.utils.ViewPortHandler
1616
import com.github.mikephil.charting.utils.convertDpToPixel
17+
import com.github.mikephil.charting.utils.getPosition
1718

1819
open class RadarChartRenderer(
1920
protected var chart: RadarChart, animator: ChartAnimator,
@@ -122,7 +123,7 @@ open class RadarChartRenderer(
122123
val factor = chart.factor
123124

124125
val center = chart.centerOffsets
125-
val pOut = MPPointF.getInstance(0f, 0f)
126+
var pOut = MPPointF.getInstance(0f, 0f)
126127
val pIcon = MPPointF.getInstance(0f, 0f)
127128

128129
val yOffset = 5f.convertDpToPixel()
@@ -146,11 +147,9 @@ open class RadarChartRenderer(
146147
for (j in 0..<dataSet.entryCount) {
147148
dataSet.getEntryForIndex(j)?.let { entry ->
148149

149-
Utils.getPosition(
150-
center,
150+
pOut = center.getPosition(
151151
(entry.y - chart.yChartMin) * factor * phaseY,
152-
sliceAngle * j * phaseX + chart.rotationAngle,
153-
pOut
152+
sliceAngle * j * phaseX + chart.rotationAngle
154153
)
155154

156155
if (dataSet.isDrawValues) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.github.mikephil.charting.utils.MPPointF
1818
import com.github.mikephil.charting.utils.Transformer
1919
import com.github.mikephil.charting.utils.Utils
2020
import com.github.mikephil.charting.utils.ViewPortHandler
21+
import com.github.mikephil.charting.utils.calcTextSize
2122
import com.github.mikephil.charting.utils.convertDpToPixel
2223
import kotlin.math.roundToInt
2324

@@ -70,7 +71,7 @@ open class XAxisRenderer(
7071
paintAxisLabels.typeface = xAxis.typeface
7172
paintAxisLabels.textSize = xAxis.textSize
7273

73-
val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
74+
val labelSize = paintAxisLabels.calcTextSize(longest)
7475

7576
val labelWidth = labelSize.width
7677
val labelHeight = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import com.github.mikephil.charting.utils.MPPointF
1515
import com.github.mikephil.charting.utils.Transformer
1616
import com.github.mikephil.charting.utils.Utils
1717
import com.github.mikephil.charting.utils.ViewPortHandler
18+
import com.github.mikephil.charting.utils.calcTextSize
1819
import com.github.mikephil.charting.utils.convertDpToPixel
1920
import kotlin.math.roundToInt
2021

@@ -57,7 +58,7 @@ open class XAxisRendererHorizontalBarChart(
5758

5859
val longest = xAxis.longestLabel
5960

60-
val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
61+
val labelSize = paintAxisLabels.calcTextSize(longest)
6162

6263
val labelWidth = (labelSize.width + xAxis.xOffset * 3.5f).toInt().toFloat()
6364
val labelHeight = labelSize.height

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.graphics.Canvas
44
import com.github.mikephil.charting.charts.RadarChart
55
import com.github.mikephil.charting.components.XAxis
66
import com.github.mikephil.charting.utils.MPPointF
7-
import com.github.mikephil.charting.utils.Utils
87
import com.github.mikephil.charting.utils.ViewPortHandler
8+
import com.github.mikephil.charting.utils.getPosition
99

1010
class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, private val chart: RadarChart) : XAxisRenderer(viewPortHandler, xAxis, null) {
1111
override fun renderAxisLabels(canvas: Canvas) {
@@ -26,14 +26,14 @@ class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, pr
2626
val factor = chart.factor
2727

2828
val center = chart.centerOffsets
29-
val pOut = MPPointF.getInstance(0f, 0f)
29+
var pOut = MPPointF.getInstance(0f, 0f)
3030
for (i in 0..<chart.data!!.maxEntryCountSet.entryCount) {
3131
val label = xAxis.valueFormatter?.getFormattedValue(i.toFloat(), xAxis)
3232

3333
val angle = (sliceAngle * i + chart.rotationAngle) % 360f
3434

35-
Utils.getPosition(
36-
center, chart.yRange * factor + xAxis.mLabelWidth / 2f, angle, pOut
35+
pOut = center.getPosition(
36+
chart.yRange * factor + xAxis.mLabelWidth / 2f, angle
3737
)
3838

3939
drawLabel(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import android.graphics.Path
55
import com.github.mikephil.charting.charts.RadarChart
66
import com.github.mikephil.charting.components.YAxis
77
import com.github.mikephil.charting.utils.MPPointF
8-
import com.github.mikephil.charting.utils.Utils
98
import com.github.mikephil.charting.utils.ViewPortHandler
9+
import com.github.mikephil.charting.utils.getPosition
1010
import com.github.mikephil.charting.utils.roundToNextSignificant
1111
import kotlin.math.abs
1212
import kotlin.math.ceil
@@ -144,7 +144,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
144144
paintAxisLabels.color = yAxis.textColor
145145

146146
val center = chart.centerOffsets
147-
val pOut = MPPointF.getInstance(0f, 0f)
147+
var pOut = MPPointF.getInstance(0f, 0f)
148148
val factor = chart.factor
149149

150150
val from = if (yAxis.isDrawBottomYLabelEntryEnabled) 0 else 1
@@ -158,7 +158,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
158158
for (j in from..<to) {
159159
val r = (yAxis.mEntries[j] - yAxis.mAxisMinimum) * factor
160160

161-
Utils.getPosition(center, r, chart.rotationAngle, pOut)
161+
pOut = center.getPosition(r, chart.rotationAngle)
162162

163163
val label = yAxis.getFormattedLabel(j)
164164

@@ -178,7 +178,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
178178
val factor = chart.factor
179179

180180
val center = chart.centerOffsets
181-
val pOut = MPPointF.getInstance(0f, 0f)
181+
var pOut = MPPointF.getInstance(0f, 0f)
182182
for (i in limitLines.indices) {
183183
val limitLine = limitLines[i]
184184

@@ -195,7 +195,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
195195

196196

197197
for (j in 0..<chart.data!!.maxEntryCountSet.entryCount) {
198-
Utils.getPosition(center, r, sliceAngle * j + chart.rotationAngle, pOut)
198+
pOut = center.getPosition(r, sliceAngle * j + chart.rotationAngle)
199199

200200
if (j == 0) limitPath.moveTo(pOut.x, pOut.y)
201201
else limitPath.lineTo(pOut.x, pOut.y)

0 commit comments

Comments
 (0)