Skip to content

Commit 96ab31f

Browse files
committed
Kotlin ChartHighLighter
1 parent 0839c67 commit 96ab31f

9 files changed

Lines changed: 230 additions & 258 deletions

File tree

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package com.github.mikephil.charting.highlight
22

3-
import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData
43
import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
54
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
65
import com.github.mikephil.charting.utils.MPPointD
76
import kotlin.math.abs
87
import kotlin.math.max
98

10-
open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataProvider?>(chart) {
9+
open class BarHighlighter(barDataProvider: BarDataProvider?) : ChartHighlighter<BarDataProvider?>(barDataProvider) {
1110
override fun getHighlight(x: Float, y: Float): Highlight? {
1211
val high = super.getHighlight(x, y) ?: return null
1312

1413
val pos = getValsForTouch(x, y)
1514

16-
val barData = mChart!!.barData
15+
val barData = provider!!.barData
1716

1817
val set = barData.getDataSetByIndex(high.dataSetIndex)
1918
if (set.isStacked()) {
@@ -47,7 +46,7 @@ open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataPro
4746
if (ranges.isNotEmpty()) {
4847
val stackIndex = getClosestStackIndex(ranges, yVal)
4948

50-
val pixels = mChart!!.getTransformer(set.axisDependency)!!.getPixelForValues(high.x, ranges[stackIndex].to)
49+
val pixels = provider!!.getTransformer(set.axisDependency)!!.getPixelForValues(high.x, ranges[stackIndex].to)
5150

5251
val stackedHigh = Highlight(
5352
entry.x,
@@ -91,7 +90,4 @@ open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataPro
9190
return abs(x1 - x2)
9291
}
9392

94-
override fun getData(): BarLineScatterCandleBubbleData<*> {
95-
return mChart!!.barData
96-
}
9793
}

MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.java

Lines changed: 0 additions & 212 deletions
This file was deleted.

0 commit comments

Comments
 (0)