Major work on highlights

Author: danielgindi

Charts/Charts.xcodeproj/project.pbxproj

@@ -451,23 +451,6 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
         prepareValuePxMatrix()
     }
 
-    public override func getMarkerPosition(entry e: ChartDataEntry, highlight: ChartHighlight) -> CGPoint
-    {
-        guard let data = _data else { return CGPointZero }
-        
-        let dataSetIndex = highlight.dataSetIndex
-        let xPos = e.x
-        let yPos = e.y * _animator.phaseY
-        
-        // position of the marker depends on selected value index and value
-        var pt = CGPoint(x: CGFloat(xPos), y: CGFloat(yPos * _animator.phaseY))
-        
-        getTransformer(data.getDataSetByIndex(dataSetIndex)!.axisDependency)
-            .pointValueToPixel(&pt)
-        
-        return pt
-    }
-    
     /// draws the grid background
     internal func drawGridBackground(context context: CGContext)
     {
@@ -1560,18 +1543,6 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     {
         return drawBordersEnabled
     }
-    
-    /// - returns: the Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the Line-, Scatter-, or CandleStick-Chart.
-    public func getHighlightByTouchPoint(pt: CGPoint) -> ChartHighlight?
-    {
-        if _data === nil
-        {
-            Swift.print("Can't select by touch. No data set.")
-            return nil
-        }
-
-        return self.highlighter?.getHighlight(x: pt.x, y: pt.y)
-    }
 
     /// - returns: the x and y values in the chart at the given touch point
     /// (encapsulated in a `CGPoint`). This method transforms pixel coordinates to
@@ -1602,7 +1573,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
         let h = getHighlightByTouchPoint(pt)
         if (h !== nil)
         {
-            return _data!.getEntryForHighlight(h!)
+            return _data!.entryForHighlight(h!)
         }
         return nil
     }

Charts/Classes/Charts/BarLineChartViewBase.swift

@@ -26,7 +26,7 @@ public protocol ChartViewDelegate
     /// Called when a value has been selected inside the chart.
     /// - parameter entry: The selected Entry.
     /// - parameter dataSetIndex: The index in the datasets array of the data object the Entrys DataSet is in.
-    optional func chartValueSelected(chartView: ChartViewBase, entry: ChartDataEntry, dataSetIndex: Int, highlight: ChartHighlight)
+    optional func chartValueSelected(chartView: ChartViewBase, entry: ChartDataEntry, highlight: ChartHighlight)
 
     // Called when nothing has been selected or an "un-select" has been made.
     optional func chartValueNothingSelected(chartView: ChartViewBase)
@@ -108,7 +108,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     /// object responsible for rendering the data
     public var renderer: ChartDataRendererBase?
 
-    public var highlighter: ChartHighlighter?
+    public var highlighter: IChartHighlighter?
 
     /// object that manages the bounds and drawing constraints of the chart
     internal var _viewPortHandler: ChartViewPortHandler!
@@ -490,7 +490,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
         else
         {
             // set the indices to highlight
-            entry = _data?.getEntryForHighlight(h!)
+            entry = _data?.entryForHighlight(h!)
             if (entry == nil)
             {
                 h = nil
@@ -501,7 +501,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
                 if self is BarLineChartViewBase
                     && (self as! BarLineChartViewBase).isHighlightFullBarEnabled
                 {
-                    h = ChartHighlight(x: h!.x, y: Double.NaN, dataIndex: -1, dataSetIndex: -1, stackIndex: -1)
+                    h = ChartHighlight(x: h!.x, y: Double.NaN, xPx: CGFloat.NaN, yPx: CGFloat.NaN, dataSetIndex: -1, axis: .Left)
                 }
 
                 _indicesToHighlight = [h!]
@@ -517,14 +517,28 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
             else
             {
                 // notify the listener
-                delegate!.chartValueSelected?(self, entry: entry!, dataSetIndex: h!.dataSetIndex, highlight: h!)
+                delegate!.chartValueSelected?(self, entry: entry!, highlight: h!)
             }
         }
 
         // redraw the chart
         setNeedsDisplay()
     }
 
+    /// Returns the Highlight object (contains x-index and DataSet index) of the
+    /// selected value at the given touch point inside the Line-, Scatter-, or
+    /// CandleStick-Chart.
+    public func getHighlightByTouchPoint(pt: CGPoint) -> ChartHighlight?
+    {
+        if _data === nil
+        {
+            Swift.print("Can't select by touch. No data set.")
+            return nil
+        }
+        
+        return self.highlighter?.getHighlight(x: pt.x, y: pt.y)
+    }
+
     /// The last value that was highlighted via touch.
     public var lastHighlighted: ChartHighlight?
 
@@ -545,7 +559,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
 
             guard let
                 set = data?.getDataSetByIndex(highlight.dataSetIndex),
-                e = _data?.getEntryForHighlight(highlight)
+                e = _data?.entryForHighlight(highlight)
                 else { continue }
 
             let entryIndex = set.entryIndex(entry: e)
@@ -554,7 +568,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
                 continue
             }
 
-            let pos = getMarkerPosition(entry: e, highlight: highlight)
+            let pos = getMarkerPosition(highlight: highlight)
 
             // check bounds
             if !_viewPortHandler.isInBounds(x: pos.x, y: pos.y)
@@ -579,9 +593,9 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     }
 
     /// - returns: the actual position in pixels of the MarkerView for the given Entry in the given DataSet.
-    public func getMarkerPosition(entry entry: ChartDataEntry, highlight: ChartHighlight) -> CGPoint
+    public func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint
     {
-        fatalError("getMarkerPosition() cannot be called on ChartViewBase")
+        return CGPoint(x: highlight.drawX, y: highlight.drawY)
     }
 
     // MARK: - Animation

Charts/Classes/Charts/ChartViewBase.swift

@@ -15,7 +15,7 @@ import Foundation
 import CoreGraphics
 
 /// This chart class allows the combination of lines, bars, scatter and candle data all displayed in one chart area.
-public class CombinedChartView: BarLineChartViewBase, LineChartDataProvider, BarChartDataProvider, ScatterChartDataProvider, CandleChartDataProvider, BubbleChartDataProvider
+public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
 {
     /// the fill-formatter used for determining the position of the fill-line
     internal var _fillFormatter: ChartFillFormatter!
@@ -35,7 +35,7 @@ public class CombinedChartView: BarLineChartViewBase, LineChartDataProvider, Bar
     {
         super.initialize()
 
-        self.highlighter = CombinedHighlighter(chart: self)
+        self.highlighter = CombinedHighlighter(chart: self, barDataProvider: self)
 
         // Old default behaviour
         self.highlightFullBarEnabled = true
@@ -56,6 +56,9 @@ public class CombinedChartView: BarLineChartViewBase, LineChartDataProvider, Bar
         set
         {
             super.data = newValue
+            
+            self.highlighter = CombinedHighlighter(chart: self, barDataProvider: self)
+            
             (renderer as! CombinedChartRenderer?)!.createRenderers()
             renderer?.initBuffers()
         }
@@ -77,6 +80,16 @@ public class CombinedChartView: BarLineChartViewBase, LineChartDataProvider, Bar
         }
     }
 
+    // MARK: - CombinedChartDataProvider
+    
+    public var combinedData: CombinedChartData?
+    {
+        get
+        {
+            return _data as? CombinedChartData
+        }
+    }
+    
     // MARK: - LineChartDataProvider
 
     public var lineData: LineChartData?

Charts/Classes/Charts/CombinedChartView.swift

@@ -100,6 +100,11 @@ public class HorizontalBarChartView: BarChartView
         _leftAxisTransformer.prepareMatrixValuePx(chartXMin: _leftAxis._axisMinimum, deltaX: CGFloat(_leftAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum)
     }
 
+    public override func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint
+    {
+        return CGPoint(x: highlight.drawY, y: highlight.drawX)
+    }
+    
     public override func getBarBounds(e: BarChartDataEntry) -> CGRect
     {
         guard let

Charts/Classes/Charts/HorizontalBarChartView.swift

@@ -80,6 +80,8 @@ public class PieChartView: PieRadarChartViewBase
 
         renderer = PieChartRenderer(chart: self, animator: _animator, viewPortHandler: _viewPortHandler)
         _xAxis = nil
+        
+        self.highlighter = PieChartHighlighter(chart: self)
     }
 
     public override func drawRect(rect: CGRect)
@@ -140,7 +142,7 @@ public class PieChartView: PieRadarChartViewBase
         calcAngles()
     }
 
-    public override func getMarkerPosition(entry e: ChartDataEntry, highlight: ChartHighlight) -> CGPoint
+    public override func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint
     {
         let center = self.centerCircleBox
         var r = self.radius
@@ -156,8 +158,7 @@ public class PieChartView: PieRadarChartViewBase
 
         let rotationAngle = self.rotationAngle
 
-        guard let entryIndex = data?.dataSets[0].entryIndex(x: highlight.x, rounding: .Closest)
-            else { return CGPoint(x: 0.0, y: 0.0) }
+        let entryIndex = Int(highlight.x)
 
         // offset needed to center the drawn text in the slice
         let offset = drawAngles[entryIndex] / 2.0
@@ -213,20 +214,19 @@ public class PieChartView: PieRadarChartViewBase
         }
     }
 
-    /// checks if the given index in the given DataSet is set for highlighting or not
-    public func needsHighlight(xValue xValue: Double, dataSetIndex: Int) -> Bool
+    /// Checks if the given index is set to be highlighted.
+    public func needsHighlight(index index: Int) -> Bool
     {
         // no highlight
-        if (!valuesToHighlight() || dataSetIndex < 0)
+        if !valuesToHighlight()
         {
             return false
         }
 
         for i in 0 ..< _indicesToHighlight.count
         {
             // check if the xvalue for the given dataset needs highlight
-            if (_indicesToHighlight[i].x == xValue
-                && _indicesToHighlight[i].dataSetIndex == dataSetIndex)
+            if Int(_indicesToHighlight[i].x) == index
             {
                 return true
             }

Charts/Classes/Charts/PieChartView.swift

@@ -279,7 +279,7 @@ public class PieRadarChartViewBase: ChartViewBase
 
     /// Calculates the position around a center point, depending on the distance
     /// from the center, and the angle of the position around the center.
-    internal func getPosition(center center: CGPoint, dist: CGFloat, angle: CGFloat) -> CGPoint
+    public func getPosition(center center: CGPoint, dist: CGFloat, angle: CGFloat) -> CGPoint
     {
         return CGPoint(x: center.x + dist * cos(angle * ChartUtils.Math.FDEG2RAD),
                 y: center.y + dist * sin(angle * ChartUtils.Math.FDEG2RAD))
@@ -391,36 +391,6 @@ public class PieRadarChartViewBase: ChartViewBase
         return 0.0
     }
 
-    /// The SelectionDetail objects give information about the value at the selected index and the DataSet it belongs to.
-    /// - returns: an array of SelectionDetail objects for the given x-index.
-    public func getSelectionDetailsAtIndex(xValue: Double) -> [ChartSelectionDetail]
-    {
-        var vals = [ChartSelectionDetail]()
-        
-        guard let data = _data else { return vals }
-
-        for i in 0 ..< data.dataSetCount
-        {
-            guard let dataSet = data.getDataSetByIndex(i) else { continue }
-            
-            if !dataSet.isHighlightEnabled
-            {
-                continue
-            }
-            
-            // extract all y-values from all DataSets at the given x-index
-            let yVal = dataSet.yValueForXValue(xValue)
-            if (yVal.isNaN)
-            {
-                continue
-            }
-            
-            vals.append(ChartSelectionDetail(xValue: 0.0, yValue: yVal, dataSetIndex: i, dataSet: dataSet))
-        }
-        
-        return vals
-    }
-    
     public var isRotationEnabled: Bool { return rotationEnabled; }
 
     /// flag that indicates if rotation is done with two fingers or one.
@@ -860,79 +830,9 @@ public class PieRadarChartViewBase: ChartViewBase
             if !self.isHighLightPerTapEnabled { return }
 
             let location = recognizer.locationInView(self)
-            let distance = distanceToCenter(x: location.x, y: location.y)
 
-            // check if a slice was touched
-            if (distance > self.radius)
-            {
-                // if no slice was touched, highlight nothing
-                self.highlightValues(nil)
-                
-                if _lastHighlight == nil
-                {
-                    self.highlightValues(nil) // do not call delegate
-                }
-                else
-                {
-                    self.highlightValue(highlight: nil, callDelegate: true) // call delegate
-                }
-                
-                _lastHighlight = nil
-            }
-            else
-            {
-                var angle = angleForPoint(x: location.x, y: location.y)
-                
-                if (self.isKindOfClass(PieChartView))
-                {
-                    angle /= CGFloat(_animator.phaseY)
-                }
-                
-                let index = indexForAngle(angle)
-                
-                // check if the index could be found
-                if (index < 0)
-                {
-                    self.highlightValues(nil)
-                    _lastHighlight = nil
-                }
-                else
-                {
-                    let valsAtIndex = getSelectionDetailsAtIndex(Double(index))
-                    
-                    var dataSetIndex = 0
-                    
-                    // get the dataset that is closest to the selection (PieChart only has one DataSet)
-                    if (self.isKindOfClass(RadarChartView))
-                    {
-                        dataSetIndex = ChartUtils.closestDataSetIndexByValue(
-                            valsAtIndex: valsAtIndex,
-                            value: Double(distance / (self as! RadarChartView).factor),
-                            axis: nil) ?? -1
-                    }
-                    
-                    if (dataSetIndex < 0)
-                    {
-                        self.highlightValues(nil)
-                        _lastHighlight = nil
-                    }
-                    else
-                    {
-                        let h = ChartHighlight(x: Double(index), dataSetIndex: dataSetIndex)
-                        
-                        if (_lastHighlight !== nil && h == _lastHighlight)
-                        {
-                            self.highlightValue(highlight: nil, callDelegate: true)
-                            _lastHighlight = nil
-                        }
-                        else
-                        {
-                            self.highlightValue(highlight: h, callDelegate: true)
-                            _lastHighlight = h
-                        }
-                    }
-                }
-            }
+            let high = self.getHighlightByTouchPoint(location)
+            self.highlightValue(high)
         }
     }