diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt index 9c719f2fe..d4930053b 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt @@ -59,7 +59,7 @@ open class BarChart : BarLineChartBase, BarDataProvider { dataRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius) - setHighlighter(BarHighlighter(this)) + highlighter = BarHighlighter(this) xAxis.spaceMin = 0.5f xAxis.spaceMax = 0.5f diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt index 35dd5ead8..155c975ee 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt @@ -187,7 +187,8 @@ abstract class BarLineChartBase>> : ViewGroup, IBaseP protected var dataRenderer: DataRenderer? = null var highlighter: IHighlighter? = null - protected set /** * Returns the ViewPortHandler of the chart that is responsible for the @@ -1046,10 +1044,6 @@ abstract class Chart>> : ViewGroup, IBaseP /** * Returns a recyclable PointF instance. */ - fun setHighlighter(highlighter: ChartHighlighter<*>?) { - this.highlighter = highlighter - } - override val centerOfView: PointF get() = this.center diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt index 4dfd2a249..013bfc881 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt @@ -372,7 +372,7 @@ open class CombinedChart : BarLineChartBase, CombinedDataProvider get() = this@CombinedChart.candleData } - setHighlighter(CombinedHighlighter(this, barDataProvider)) + highlighter = CombinedHighlighter(this, barDataProvider) // Old default behaviour this@CombinedChart.isHighlightFullBar = true diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt index 23e07f461..369fad84f 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt @@ -44,7 +44,7 @@ open class HorizontalBarChart : BarChart { mRightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler) dataRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler) - setHighlighter(HorizontalBarHighlighter(this)) + highlighter = HorizontalBarHighlighter(this) axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer) axisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer) diff --git a/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt index 74124f86f..a49a5a5ef 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt @@ -86,7 +86,7 @@ open class ChartHighlighter>(prote * @param x touch position * @param y touch position */ - protected open fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList? { + override fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList? { highlightBuffer.clear() data?.let { myData -> diff --git a/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt index 211fb3a6d..81efff74e 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt @@ -5,4 +5,6 @@ interface IHighlighter { * Returns a Highlight object corresponding to the given x- and y- touch positions in pixels. */ fun getHighlight(x: Float, y: Float): Highlight? + + fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList? } diff --git a/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt index e10b932f3..de53e5eb9 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt @@ -37,4 +37,10 @@ abstract class PieRadarHighlighter>(protected var chart * Returns the closest Highlight object of the given objects based on the touch position inside the chart. */ protected abstract fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight? + + override fun getHighlightsAtXValue( + xVal: Float, + x: Float, + y: Float + ): MutableList? = null } diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click.png index e7a1ec37e..323b848a4 100644 Binary files a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click.png and b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click2020.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click2020.png index e7a1ec37e..5b30ba56e 100644 Binary files a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click2020.png and b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click2020.png differ diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click7070.png b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click7070.png index e7a1ec37e..435f09d5a 100644 Binary files a/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click7070.png and b/screenshotsToCompare9/StartTest_smokeTestStart-25-CombinedChartActivity-CombinedChart-click7070.png differ