Skip to content

Cleanup HighLighter #530

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

Merged
hannesa2 merged 1 commit into from
Dec 22, 2025
Merged

Cleanup HighLighter #530

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
9 changes: 5 additions & 4 deletions MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
var distance = Float.MAX_VALUE

for (i in closestValues.indices) {
val high = closestValues.get(i)
val high = closestValues[i]

if (high.axis == axis) {
val tempDistance = abs(getHighlightPos(high) - pos)
Expand Down Expand Up @@ -112,6 +112,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
/**
* An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
*/
@Suppress("SameParameterValue")
protected open fun buildHighlights(set: IDataSet<*>, dataSetIndex: Int, xVal: Float, rounding: DataSet.Rounding?): MutableList<Highlight> {
val highlights = ArrayList<Highlight>()

Expand All @@ -129,7 +130,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte

if (entries != null)
for (e in entries) {
val pixels = provider!!.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y)
val pixels = provider.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y)

highlights.add(
Highlight(
Expand Down Expand Up @@ -159,7 +160,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
var distance = minSelectionDistance

for (i in closestValues.indices) {
val high = closestValues.get(i)
val high = closestValues[i]

if (axis == null || high.axis == axis) {
val cDistance = getDistance(x, y, high.xPx, high.yPx)
Expand All @@ -184,5 +185,5 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
}

protected open val data: BarLineScatterCandleBubbleData<*>
get() = provider!!.getData()
get() = provider.getData()
}
20 changes: 10 additions & 10 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 @@ -11,7 +11,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
override fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight? {
val highlights = getHighlightsAtIndex(index)

val distanceToCenter = chartPieRadar!!.distanceToCenter(x, y) / chartPieRadar!!.getFactor()
val distanceToCenter = chartPieRadar.distanceToCenter(x, y) / chartPieRadar.getFactor()

var closest: Highlight? = null
var distance = Float.MAX_VALUE
Expand All @@ -38,22 +38,22 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
protected fun getHighlightsAtIndex(index: Int): MutableList<Highlight> {
mHighlightBuffer.clear()

val phaseX = chartPieRadar!!.animator.phaseX
val phaseY = chartPieRadar!!.animator.phaseY
val sliceAngle = chartPieRadar!!.sliceAngle
val factor = chartPieRadar!!.getFactor()
val phaseX = chartPieRadar.animator.phaseX
val phaseY = chartPieRadar.animator.phaseY
val sliceAngle = chartPieRadar.sliceAngle
val factor = chartPieRadar.getFactor()

val pOut = MPPointF.getInstance(0f, 0f)
for (i in 0..<chartPieRadar!!.data!!.getDataSetCount()) {
val dataSet: IDataSet<*> = chartPieRadar!!.data!!.getDataSetByIndex(i)
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)
val y = (entry!!.y - chartPieRadar.yChartMin)

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

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