|
1 | 1 | package com.github.mikephil.charting.highlight |
2 | 2 |
|
3 | | -import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData |
4 | 3 | import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider |
5 | 4 | import com.github.mikephil.charting.interfaces.datasets.IBarDataSet |
6 | 5 | import com.github.mikephil.charting.utils.MPPointD |
7 | 6 | import kotlin.math.abs |
8 | 7 | import kotlin.math.max |
9 | 8 |
|
10 | | -open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataProvider?>(chart) { |
| 9 | +open class BarHighlighter(barDataProvider: BarDataProvider?) : ChartHighlighter<BarDataProvider?>(barDataProvider) { |
11 | 10 | override fun getHighlight(x: Float, y: Float): Highlight? { |
12 | 11 | val high = super.getHighlight(x, y) ?: return null |
13 | 12 |
|
14 | 13 | val pos = getValsForTouch(x, y) |
15 | 14 |
|
16 | | - val barData = mChart!!.barData |
| 15 | + val barData = provider!!.barData |
17 | 16 |
|
18 | 17 | val set = barData.getDataSetByIndex(high.dataSetIndex) |
19 | 18 | if (set.isStacked()) { |
@@ -47,7 +46,7 @@ open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataPro |
47 | 46 | if (ranges.isNotEmpty()) { |
48 | 47 | val stackIndex = getClosestStackIndex(ranges, yVal) |
49 | 48 |
|
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) |
51 | 50 |
|
52 | 51 | val stackedHigh = Highlight( |
53 | 52 | entry.x, |
@@ -91,7 +90,4 @@ open class BarHighlighter(chart: BarDataProvider?) : ChartHighlighter<BarDataPro |
91 | 90 | return abs(x1 - x2) |
92 | 91 | } |
93 | 92 |
|
94 | | - override fun getData(): BarLineScatterCandleBubbleData<*> { |
95 | | - return mChart!!.barData |
96 | | - } |
97 | 93 | } |
0 commit comments