Merge pull request #683 from AppDevNext/Revert

Revert EntryDouble and FixHighlightInCombinedChart

Author: hannesa2

chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt

@@ -59,7 +59,7 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
 
         dataRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
 
-        highlighter = BarHighlighter(this)
+        setHighlighter(BarHighlighter(this))
 
         xAxis.spaceMin = 0.5f
         xAxis.spaceMax = 0.5f

chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt

@@ -187,8 +187,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
 
         xAxisRenderer = XAxisRenderer(viewPortHandler, mXAxis, mLeftAxisTransformer)
 
-        if (highlighter == null) // otherwise it overwrites highlighter from successors
-            highlighter = ChartHighlighter(this)
+        setHighlighter(ChartHighlighter(this))
 
         chartTouchListener = BarLineChartTouchListener(this, viewPortHandler.matrixTouch, 3f)
 

chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt

@@ -26,6 +26,7 @@ import info.appdev.charting.data.ChartData
 import info.appdev.charting.data.Entry
 import info.appdev.charting.formatter.DefaultValueFormatter
 import info.appdev.charting.formatter.IValueFormatter
+import info.appdev.charting.highlight.ChartHighlighter
 import info.appdev.charting.highlight.Highlight
 import info.appdev.charting.highlight.IHighlighter
 import info.appdev.charting.interfaces.dataprovider.base.IBaseProvider
@@ -151,6 +152,7 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
     protected var dataRenderer: DataRenderer? = null
 
     var highlighter: IHighlighter? = null
+        protected set
 
     /**
      * Returns the ViewPortHandler of the chart that is responsible for the
@@ -1044,6 +1046,10 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
     /**
      * Returns a recyclable PointF instance.
      */
+    fun setHighlighter(highlighter: ChartHighlighter<*>?) {
+        this.highlighter = highlighter
+    }
+
     override val centerOfView: PointF
         get() = this.center
 

chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt

@@ -372,7 +372,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
                 get() = this@CombinedChart.candleData
         }
 
-        highlighter = CombinedHighlighter(this, barDataProvider)
+        setHighlighter(CombinedHighlighter(this, barDataProvider))
 
         // Old default behaviour
         this@CombinedChart.isHighlightFullBar = true

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)
-        highlighter = HorizontalBarHighlighter(this)
+        setHighlighter(HorizontalBarHighlighter(this))
 
         axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)
         axisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)

chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleDataSet.kt

@@ -7,7 +7,7 @@ import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataS
 /**
  * Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart.
  */
-abstract class BarLineScatterCandleBubbleDataSet<T : BaseEntry<Float>>(yVals: MutableList<T>, label: String) :
+abstract class BarLineScatterCandleBubbleDataSet<T : Entry>(yVals: MutableList<T>, label: String) :
     DataSet<T>(yVals, label), IBarLineScatterCandleBubbleDataSet<T> {
     /**
      * Sets the color that is used for drawing the highlight indicators.

chartLib/src/main/kotlin/info/appdev/charting/data/BaseDataSet.kt

@@ -19,7 +19,7 @@ import info.appdev.charting.utils.convertDpToPixel
  * This is the base dataset of all DataSets. It's purpose is to implement critical methods
  * provided by the IDataSet interface.
  */
-abstract class BaseDataSet<T : BaseEntry<Float>>() : IDataSet<T> {
+abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
     /**
      * List representing all colors that are used for this DataSet
      */

chartLib/src/main/kotlin/info/appdev/charting/data/BaseEntry.kt

@@ -2,94 +2,34 @@ package info.appdev.charting.data
 
 import android.graphics.drawable.Drawable
 
-abstract class BaseEntry<T> where T : Number, T : Comparable<T> {
+abstract class BaseEntry {
 
-    protected var yBase: T? = null
-    protected var xBase: T? = null
-
-    open var y: T
-        get() = yBase ?: throw IllegalStateException("y not initialized")
+    protected var yBase: Float = 0f
+    open var y: Float
+        get() = yBase
         set(value) {
             yBase = value
         }
 
-    open var x: T
-        get() = xBase ?: throw IllegalStateException("x not initialized")
-        set(value) {
-            xBase = value
-        }
-
     var data: Any? = null
 
     var icon: Drawable? = null
 
     constructor()
 
-    constructor(y: T) {
-        this.yBase = y
-    }
-
-    constructor(y: T, data: Any?) : this(y) {
-        this.data = data
-    }
-
-    constructor(y: T, icon: Drawable?) : this(y) {
-        this.icon = icon
-    }
-
-    constructor(y: T, icon: Drawable?, data: Any?) : this(y) {
-        this.icon = icon
-        this.data = data
-    }
-
-    /**
-     * A Entry represents one single entry in the chart.
-     *
-     * @param x the x value
-     * @param y the y value (the actual value of the entry)
-     */
-    constructor(x: T, y: T) {
-        this.xBase = x
+    constructor(y: Float) {
         this.yBase = y
     }
 
-    /**
-     * A Entry represents one single entry in the chart.
-     *
-     * @param x    the x value
-     * @param y    the y value (the actual value of the entry)
-     * @param data Spot for additional data this Entry represents.
-     */
-    constructor(x: T, y: T, data: Any?) {
-        this.xBase = x
-        this.yBase = y
+    constructor(y: Float, data: Any?) : this(y) {
         this.data = data
     }
 
-    /**
-     * A Entry represents one single entry in the chart.
-     *
-     * @param x the x value
-     * @param y the y value (the actual value of the entry)
-     * @param icon icon image
-     */
-    constructor(x: T, y: T, icon: Drawable?) {
-        this.xBase = x
-        this.yBase = y
+    constructor(y: Float, icon: Drawable?) : this(y) {
         this.icon = icon
     }
 
-    /**
-     * A Entry represents one single entry in the chart.
-     *
-     * @param x the x value
-     * @param y the y value (the actual value of the entry)
-     * @param icon icon image
-     * @param data Spot for additional data this Entry represents.
-     */
-    constructor(x: T, y: T, icon: Drawable?, data: Any?)  {
-        this.xBase = x
-        this.yBase = y
+    constructor(y: Float, icon: Drawable?, data: Any?) : this(y) {
         this.icon = icon
         this.data = data
     }

chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt

@@ -446,7 +446,7 @@ abstract class ChartData<T : IDataSet<out Entry>> : Serializable {
         }
 
         val dataSet: IDataSet<*> = dataSets[dataSetIndex]
-        val entry = dataSet.getEntryForXValue(xValue, Float.NaN) as? Entry ?: return false
+        val entry: Entry = dataSet.getEntryForXValue(xValue, Float.NaN) ?: return false
 
         return removeEntry(entry, dataSetIndex)
     }

chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt

@@ -10,7 +10,7 @@ import kotlin.math.abs
  * groups of values inside the Chart (e.g. the values for a specific line in the
  * LineChart, or the values of a specific group of bars in the BarChart).
  */
-abstract class DataSet<T : BaseEntry<Float>>(
+abstract class DataSet<T : Entry>(
     protected var mEntries: MutableList<T>,
     label: String = ""
 ) : BaseDataSet<T>(label), Serializable {
@@ -219,9 +219,9 @@ abstract class DataSet<T : BaseEntry<Float>>(
         while (low < high) {
             val m = low + (high - low) / 2
 
-            val currentEntry: T = mEntries[m]
+            val currentEntry: Entry = mEntries[m]
 
-            val nextEntry: T = mEntries[m + 1]
+            val nextEntry: Entry = mEntries[m + 1]
 
             val d1 = currentEntry.x - xValue
             val d2 = nextEntry.x - xValue
@@ -251,7 +251,7 @@ abstract class DataSet<T : BaseEntry<Float>>(
             closest = high
         }
 
-        val closestEntry: T = mEntries[closest]
+        val closestEntry: Entry = mEntries[closest]
         val closestXValue = closestEntry.x
         if (rounding == Rounding.UP) {
             // If rounding up, and found x-value is lower than specified x, and we can go upper...