Skip to content

Kotlin getNormalizedAngle #535

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

Open
hannesa2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Kotlin getNormalizedAngle #535

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
3 changes: 1 addition & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.github.mikephil.charting.renderer.RadarChartRenderer;
import com.github.mikephil.charting.renderer.XAxisRendererRadarChart;
import com.github.mikephil.charting.renderer.YAxisRendererRadarChart;
import com.github.mikephil.charting.utils.Utils;
import com.github.mikephil.charting.utils.UtilsKtKt;

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

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

float sliceangle = getSliceAngle();

Expand Down
3 changes: 2 additions & 1 deletion MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.github.mikephil.charting.utils.ColorTemplate
import com.github.mikephil.charting.utils.FSize
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.calcTextSize
import com.github.mikephil.charting.utils.convertDpToPixel
import java.lang.Float
import kotlin.Array
Expand Down Expand Up @@ -463,7 +464,7 @@ class Legend() : ComponentBase() {

// grouped forms have null labels
if (label != null) {
calculatedLabelSizes.add(Utils.calcTextSize(labelpaint, label))
calculatedLabelSizes.add(labelpaint.calcTextSize(label))
requiredWidth += if (drawingForm) formToTextSpace + formSize else 0f
requiredWidth += calculatedLabelSizes.get(i)!!.width
} else {
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import com.github.mikephil.charting.formatter.IValueFormatter
import com.github.mikephil.charting.interfaces.datasets.IDataSet
import com.github.mikephil.charting.utils.ColorTemplate
import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.convertDpToPixel
import com.github.mikephil.charting.utils.getDefaultValueFormatter

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

override var valueFormatter: IValueFormatter
get() = if (needsFormatter())
Utils.getDefaultValueFormatter()
getDefaultValueFormatter()
else
mValueFormatter!!
set(value) {
Expand Down
10 changes: 5 additions & 5 deletions MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.github.mikephil.charting.charts.RadarChart
import com.github.mikephil.charting.data.Entry
import com.github.mikephil.charting.interfaces.datasets.IDataSet
import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.getPosition
import kotlin.math.abs

open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>(chart) {
Expand Down Expand Up @@ -43,17 +43,17 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
val sliceAngle = chartPieRadar.sliceAngle
val factor = chartPieRadar.getFactor()

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

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

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

Utils.getPosition(
chartPieRadar.centerOffsets, y * factor * phaseY,
sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut
pOut = chartPieRadar.centerOffsets.getPosition(
y * factor * phaseY,
sliceAngle * index * phaseX + chartPieRadar.rotationAngle
)

mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))
Expand Down
9 changes: 4 additions & 5 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.convertDpToPixel
import com.github.mikephil.charting.utils.getPosition

open class RadarChartRenderer(
protected var chart: RadarChart, animator: ChartAnimator,
Expand Down Expand Up @@ -122,7 +123,7 @@ open class RadarChartRenderer(
val factor = chart.factor

val center = chart.centerOffsets
val pOut = MPPointF.getInstance(0f, 0f)
var pOut = MPPointF.getInstance(0f, 0f)
val pIcon = MPPointF.getInstance(0f, 0f)

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

Utils.getPosition(
center,
pOut = center.getPosition(
(entry.y - chart.yChartMin) * factor * phaseY,
sliceAngle * j * phaseX + chart.rotationAngle,
pOut
sliceAngle * j * phaseX + chart.rotationAngle
)

if (dataSet.isDrawValues) {
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -18,6 +18,7 @@ import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Transformer
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.calcTextSize
import com.github.mikephil.charting.utils.convertDpToPixel
import kotlin.math.roundToInt

Expand Down Expand Up @@ -70,7 +71,7 @@ open class XAxisRenderer(
paintAxisLabels.typeface = xAxis.typeface
paintAxisLabels.textSize = xAxis.textSize

val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
val labelSize = paintAxisLabels.calcTextSize(longest)

val labelWidth = labelSize.width
val labelHeight = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()
Expand Down
3 changes: 2 additions & 1 deletion ...ib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Transformer
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.calcTextSize
import com.github.mikephil.charting.utils.convertDpToPixel
import kotlin.math.roundToInt

Expand Down Expand Up @@ -57,7 +58,7 @@ open class XAxisRendererHorizontalBarChart(

val longest = xAxis.longestLabel

val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
val labelSize = paintAxisLabels.calcTextSize(longest)

val labelWidth = (labelSize.width + xAxis.xOffset * 3.5f).toInt().toFloat()
val labelHeight = labelSize.height
Expand Down
8 changes: 4 additions & 4 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.graphics.Canvas
import com.github.mikephil.charting.charts.RadarChart
import com.github.mikephil.charting.components.XAxis
import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.getPosition

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

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

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

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

drawLabel(
Expand Down
10 changes: 5 additions & 5 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import android.graphics.Path
import com.github.mikephil.charting.charts.RadarChart
import com.github.mikephil.charting.components.YAxis
import com.github.mikephil.charting.utils.MPPointF
import com.github.mikephil.charting.utils.Utils
import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.getPosition
import com.github.mikephil.charting.utils.roundToNextSignificant
import kotlin.math.abs
import kotlin.math.ceil
Expand Down Expand Up @@ -144,7 +144,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
paintAxisLabels.color = yAxis.textColor

val center = chart.centerOffsets
val pOut = MPPointF.getInstance(0f, 0f)
var pOut = MPPointF.getInstance(0f, 0f)
val factor = chart.factor

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

Utils.getPosition(center, r, chart.rotationAngle, pOut)
pOut = center.getPosition(r, chart.rotationAngle)

val label = yAxis.getFormattedLabel(j)

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

val center = chart.centerOffsets
val pOut = MPPointF.getInstance(0f, 0f)
var pOut = MPPointF.getInstance(0f, 0f)
for (i in limitLines.indices) {
val limitLine = limitLines[i]

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


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

if (j == 0) limitPath.moveTo(pOut.x, pOut.y)
else limitPath.lineTo(pOut.x, pOut.y)
Expand Down
Loading
Loading