Sync upstream repo

Charts.xcodeproj/project.pbxproj

@@ -1038,7 +1038,8 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = YES;
+				EAGER_LINKING = YES;
+				ENABLE_MODULE_VERIFIER = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1055,12 +1056,14 @@
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=50";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 12.0;
@@ -1231,6 +1234,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				EAGER_LINKING = YES;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
@@ -1248,6 +1252,7 @@
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=50";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;

Source/Charts/Animation/ChartAnimationEasing.swift

@@ -249,7 +249,12 @@ internal struct EasingFunctions
         }
 
         position = position - 1.0
-        return Double( 0.5 * (-pow(2.0, -10.0 * position) + 2.0) )
+
+        // compute partial result so Xcode's type-checker doesn't take too long
+        let partialResult: Double = -pow(2.0, -10.0 * position) + 2.0
+
+        // took 120ms to type check before breaking out partial result, above
+        return Double( 0.5 * partialResult )
     }
 
     internal static let EaseInCirc = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
@@ -265,12 +270,17 @@ internal struct EasingFunctions
 
     internal static let EaseInOutCirc = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
         var position: TimeInterval = elapsed / (duration / 2.0)
+
+        // calculate partial result so Swift compiler doesn't lose its mind
+        let sqrtPartialResult: Double = sqrt(1.0 - position * position)
         if position < 1.0
         {
-            return Double( -0.5 * (sqrt(1.0 - position * position) - 1.0) )
+            // was 800ms to type check with inlined sqrt calculation, from above
+            return Double( -0.5 * (sqrtPartialResult - 1.0) )
         }
         position -= 2.0
-        return Double( 0.5 * (sqrt(1.0 - position * position) + 1.0) )
+        // was 1500ms to type check with inlined sqrt calculation, from above
+        return Double( 0.5 * (sqrtPartialResult + 1.0) )
     }
 
     internal static let EaseInElastic = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
@@ -328,13 +338,23 @@ internal struct EasingFunctions
             return Double( -0.5 * (pow(2.0, 10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p)) )
         }
         position -= 1.0
-        return Double( pow(2.0, -10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p) * 0.5 + 1.0 )
+
+        // Break out partial result so the Swift compiler doesn't lose its mind
+        let sinPartialResult: Double = sin((position * duration - s) * (2.0 * Double.pi) / p)
+
+        // Original expression here, with the expression above inlined, took 600ms to type check
+        return Double( pow(2.0, -10.0 * position) * sinPartialResult * 0.5 + 1.0 )
     }
 
     internal static let EaseInBack = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
         let s: TimeInterval = 1.70158
         var position: TimeInterval = elapsed / duration
-        return Double( position * position * ((s + 1.0) * position - s) )
+
+        // Break out partial result so the Swift compiler doesn't lose its mind
+        let partialResult: Double = ((s + 1.0) * position - s)
+
+        // Original expression here, with partialResult inlined, took 260ms to type check
+        return Double( position * position * partialResult )
     }
 
     internal static let EaseOutBack = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in

Source/Charts/Charts/ChartViewBase.swift

@@ -456,7 +456,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         }
 
         // set the indices to highlight
-       highlighted = [h]
+        highlighted = [h]
 
         if callDelegate
         {

Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift

@@ -51,6 +51,34 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, BarChartData
     /// the overall entry count, including counting each stack-value individually
     private var _entryCountStacks = 0
 
+    /// the corner radius applied to each data set
+    public var cornerRadius: CGFloat = 0.0
+
+    /// array of corners to be rounded
+    open var roundedCorners: UIRectCorner = [] {
+        didSet {
+            var invertedCorners: UIRectCorner = []
+            if roundedCorners.contains(.topLeft) {
+                invertedCorners.insert(.bottomLeft)
+            }
+            if roundedCorners.contains(.topRight) {
+                invertedCorners.insert(.bottomRight)
+            }
+            if roundedCorners.contains(.bottomLeft) {
+                invertedCorners.insert(.topLeft)
+            }
+            if roundedCorners.contains(.bottomRight) {
+                invertedCorners.insert(.topRight)
+            }
+            if roundedCorners.contains(.allCorners) {
+                invertedCorners.insert(.allCorners)
+            }
+            roundedCornersInverted = invertedCorners
+        }
+    }
+
+    open private(set) var roundedCornersInverted: UIRectCorner = []
+
     /// Calculates the total number of entries this DataSet represents, including
     /// stacks. All values belonging to a stack are calculated separately.
     private func calcEntryCountIncludingStacks(entries: [BarChartDataEntry])

Source/Charts/Data/Implementations/Standard/ChartData.swift

@@ -452,6 +452,10 @@ extension ChartData: MutableCollection
         get { return dataSets[position] }
         set { self._dataSets[position] = newValue }
     }
+
+    public subscript(safe index: Index) -> Element? {
+        return indices.contains(index) ? self[index] : nil
+    }
 }
 
 // MARK: RandomAccessCollection

Source/Charts/Data/Implementations/Standard/RadarChartData.swift

@@ -46,6 +46,6 @@ open class RadarChartData: ChartData
 
     @objc open override func entry(for highlight: Highlight) -> ChartDataEntry?
     {
-        return self[highlight.dataSetIndex].entryForIndex(Int(highlight.x))
+        return self[safe: highlight.dataSetIndex]?.entryForIndex(Int(highlight.x))
     }
 }

Source/Charts/Data/Interfaces/BarChartDataSetProtocol.swift

@@ -12,6 +12,10 @@
 import Foundation
 import CoreGraphics
 
+#if canImport(UIKit)
+import UIKit
+#endif
+
 @objc
 public protocol BarChartDataSetProtocol: BarLineScatterCandleBubbleChartDataSetProtocol
 {
@@ -39,4 +43,13 @@ public protocol BarChartDataSetProtocol: BarLineScatterCandleBubbleChartDataSetP
 
     /// array of labels used to describe the different values of the stacked bars
     var stackLabels: [String] { get set }
+
+    /// the corner radius applied to each data set
+    var cornerRadius: CGFloat { get set }
+
+    /// array of corners to be rounded
+    var roundedCorners: UIRectCorner { get set }
+
+    /// array of corners to be rounded
+    var roundedCornersInverted: UIRectCorner { get }
 }

Source/Charts/Renderers/BarChartRenderer.swift

@@ -351,7 +351,17 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 guard viewPortHandler.isInBoundsRight(barRect.origin.x) else { break }
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
-                context.fill(barRect)
+
+                var roundedCorners = dataSet.roundedCorners
+                if let i = buffer.firstIndex(of: barRect),
+                   let entry = dataSet.entryForIndex(i),
+                   entry.y < 0 {
+                    roundedCorners = dataSet.roundedCornersInverted
+                }
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
+                                              cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
 
@@ -379,7 +389,15 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            context.fill(barRect)
+            var roundedCorners = dataSet.roundedCorners
+            if let entry = dataSet.entryForIndex(j),
+               entry.y < 0 {
+                roundedCorners = dataSet.roundedCornersInverted
+            }
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
+                                          cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+            context.addPath(bezierPath.cgPath)
+            context.drawPath(using: .fill)
 
             if drawBorder
             {
@@ -701,7 +719,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         for high in indices
         {
             guard
-                let set = barData[high.dataSetIndex] as? BarChartDataSetProtocol,
+                let set = barData[safe: high.dataSetIndex] as? BarChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }
 
@@ -744,7 +762,14 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
 
                 setHighlightDrawPos(highlight: high, barRect: barRect)
 
-                context.fill(barRect)
+                var roundedCorners = set.roundedCorners
+                if e.y < 0 {
+                    roundedCorners = set.roundedCornersInverted
+                }
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
+                                              cornerRadii: .init(width: set.cornerRadius, height: set.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
     }

Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift

@@ -66,7 +66,9 @@ open class BarLineScatterCandleBubbleRenderer: NSObject, DataRenderer
     open func isDrawingValuesAllowed(dataProvider: ChartDataProvider?) -> Bool
     {
         guard let data = dataProvider?.data else { return false }
-        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleX)
+        let count = CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleX
+        guard count < CGFloat.infinity, !count.isNaN else { return false }
+        return data.entryCount < Int(count)
     }
 
     /// Class representing the bounds of the current viewport in terms of indices in the values array of a DataSet.

Source/Charts/Renderers/BubbleChartRenderer.swift

@@ -252,7 +252,7 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
         for high in indices
         {
             guard
-                let dataSet = bubbleData[high.dataSetIndex] as? BubbleChartDataSetProtocol,
+                let dataSet = bubbleData[safe: high.dataSetIndex] as? BubbleChartDataSetProtocol,
                 dataSet.isHighlightEnabled,
                 let entry = dataSet.entryForXValue(high.x, closestToY: high.y) as? BubbleChartDataEntry,
                 isInBoundsX(entry: entry, dataSet: dataSet)

Source/Charts/Renderers/CandleStickChartRenderer.swift

@@ -362,7 +362,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
         for high in indices
         {
             guard
-                let set = candleData[high.dataSetIndex] as? CandleChartDataSetProtocol,
+                let set = candleData[safe: high.dataSetIndex] as? CandleChartDataSetProtocol,
                 set.isHighlightEnabled
                 else { continue }
 

Source/Charts/Renderers/CombinedChartRenderer.swift

@@ -162,7 +162,9 @@ open class CombinedChartRenderer: NSObject, DataRenderer
     open func isDrawingValuesAllowed(dataProvider: ChartDataProvider?) -> Bool
     {
         guard let data = dataProvider?.data else { return false }
-        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleX)
+        let count = CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleX
+        guard count < CGFloat.infinity, !count.isNaN else { return false }
+        return data.entryCount < Int(count)
     }
 
     /// All sub-renderers.

Source/Charts/Renderers/HorizontalBarChartRenderer.swift

@@ -228,7 +228,15 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 _barShadowRectBuffer.size.width = viewPortHandler.contentWidth
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
-                context.fill(_barShadowRectBuffer)
+
+                var roundedCorners = dataSet.roundedCorners
+                if e.x < 0 {
+                    roundedCorners = dataSet.roundedCornersInverted
+                }
+                let bezierPath = UIBezierPath(roundedRect: _barShadowRectBuffer, byRoundingCorners: roundedCorners,
+                                              cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+                context.addPath(bezierPath.cgPath)
+                context.drawPath(using: .fill)
             }
         }
 
@@ -265,7 +273,15 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            context.fill(barRect)
+            var roundedCorners = dataSet.roundedCorners
+            if let entry = dataSet.entryForIndex(j),
+               entry.x < 0 {
+                roundedCorners = dataSet.roundedCornersInverted
+            }
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
+                                          cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
+            context.addPath(bezierPath.cgPath)
+            context.drawPath(using: .fill)
 
             if drawBorder
             {
@@ -614,9 +630,10 @@ open class HorizontalBarChartRenderer: BarChartRenderer
 
     open override func isDrawingValuesAllowed(dataProvider: ChartDataProvider?) -> Bool
     {
-        guard let data = dataProvider?.data
-            else { return false }
-        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * self.viewPortHandler.scaleY)
+        guard let data = dataProvider?.data else { return false }
+        let count = CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleY
+        guard count < CGFloat.infinity, !count.isNaN else { return false }
+        return data.entryCount < Int(count)
     }
 
     /// Sets the drawing position of the highlight object based on the riven bar-rect.

Source/Charts/Renderers/LineChartRenderer.swift

@@ -760,7 +760,7 @@ open class LineChartRenderer: LineRadarRenderer
 
         for high in indices
         {
-            guard let set = lineData[high.dataSetIndex] as? LineChartDataSetProtocol,
+            guard let set = lineData[safe: high.dataSetIndex] as? LineChartDataSetProtocol,
                   set.isHighlightEnabled
             else { continue }