Merge branch 'master' into release/5.0.0_updated

Author: danielgindi

Source/Charts/Renderers/PieChartRenderer.swift

@@ -123,8 +123,6 @@ open class PieChartRenderer: NSObject, DataRenderer
         let drawAngles = chart.drawAngles
         let center = chart.centerCircleBox
         let radius = chart.radius
-        let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
-        let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
 
         var visibleAngleCount = 0
         for j in 0 ..< entryCount
@@ -137,6 +135,8 @@ open class PieChartRenderer: NSObject, DataRenderer
         }
 
         let sliceSpace = visibleAngleCount <= 1 ? 0.0 : getSliceSpace(dataSet: dataSet)
+        let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled || sliceSpace > 0.0
+        let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
 
         context.saveGState()
 
@@ -180,7 +180,7 @@ open class PieChartRenderer: NSObject, DataRenderer
                 continue
             }
 
-            let accountForSliceSpacing = sliceSpace > 0.0 && sliceAngle <= 180.0
+            let accountForSliceSpacing = sliceSpace > 0.0
 
             context.setFillColor(dataSet.color(atIndex: j).cgColor)
 
@@ -207,6 +207,8 @@ open class PieChartRenderer: NSObject, DataRenderer
             if drawInnerArc &&
                 (innerRadius > 0.0 || accountForSliceSpacing)
             {
+                var hasZeroInnerRadius = innerRadius == 0.0
+
                 if accountForSliceSpacing
                 {
                     var minSpacedRadius = calculateMinimumRadiusForSpacedSlice(
@@ -235,42 +237,29 @@ open class PieChartRenderer: NSObject, DataRenderer
                 }
                 let endAngleInner = startAngleInner + sweepAngleInner
 
-                path.addLine(
-                    to: CGPoint(
-                        x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
-                        y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
-
-                path.addRelativeArc(center: center, radius: innerRadius, startAngle: endAngleInner.DEG2RAD, delta: -sweepAngleInner.DEG2RAD)
-            }
-            else
-            {
-                if accountForSliceSpacing
+                if sliceAngle > 180.0 && hasZeroInnerRadius && accountForSliceSpacing
                 {
-                    let angleMiddle = startAngleOuter + sweepAngleOuter / 2.0
-
-                    let sliceSpaceOffset =
-                        calculateMinimumRadiusForSpacedSlice(
-                            center: center,
-                            radius: radius,
-                            angle: sliceAngle * CGFloat(phaseY),
-                            arcStartPointX: arcStartPointX,
-                            arcStartPointY: arcStartPointY,
-                            startAngle: startAngleOuter,
-                            sweepAngle: sweepAngleOuter)
-
-                    let arcEndPointX = center.x + sliceSpaceOffset * cos(angleMiddle.DEG2RAD)
-                    let arcEndPointY = center.y + sliceSpaceOffset * sin(angleMiddle.DEG2RAD)
+                    let midAngleInner = (startAngleInner + endAngleInner) / 2
 
                     path.addLine(
                         to: CGPoint(
-                            x: arcEndPointX,
-                            y: arcEndPointY))
+                            x: center.x + innerRadius * cos(midAngleInner.DEG2RAD),
+                            y: center.y + innerRadius * sin(midAngleInner.DEG2RAD)))
                 }
                 else
                 {
-                    path.addLine(to: center)
+                    path.addLine(
+                        to: CGPoint(
+                            x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
+                            y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
+
+                    path.addRelativeArc(center: center, radius: innerRadius, startAngle: endAngleInner.DEG2RAD, delta: -sweepAngleInner.DEG2RAD)
                 }
             }
+            else
+            {
+                path.addLine(to: center)
+            }
 
             path.closeSubpath()
 
@@ -518,7 +507,7 @@ open class PieChartRenderer: NSObject, DataRenderer
                 {
                     // calculate the text position
                     let x = labelRadius * sliceXBase + center.x
-                    let y = labelRadius * sliceYBase + center.y - lineHeight
+                    let y = labelRadius * sliceYBase + center.y - lineHeight / 2.0
 
                     if drawXInside && drawYInside
                     {
@@ -716,8 +705,6 @@ open class PieChartRenderer: NSObject, DataRenderer
         let absoluteAngles = chart.absoluteAngles
         let center = chart.centerCircleBox
         let radius = chart.radius
-        let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
-        let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
 
         // Append highlighted accessibility slices into this array, so we can prioritize them over unselected slices
         var highlightedAccessibleElements: [NSUIAccessibilityElement] = []
@@ -755,14 +742,16 @@ open class PieChartRenderer: NSObject, DataRenderer
             }
 
             let sliceSpace = visibleAngleCount <= 1 ? 0.0 : set.sliceSpace
+            let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled || sliceSpace > 0.0
+            let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
 
             let sliceAngle = drawAngles[index]
             var innerRadius = userInnerRadius
 
             let shift = set.selectionShift
             let highlightedRadius = radius + shift
 
-            let accountForSliceSpacing = sliceSpace > 0.0 && sliceAngle <= 180.0
+            let accountForSliceSpacing = sliceSpace > 0.0
 
             context.setFillColor(set.highlightColor?.cgColor ?? set.color(atIndex: index).cgColor)
 
@@ -812,6 +801,8 @@ open class PieChartRenderer: NSObject, DataRenderer
             if drawInnerArc &&
                 (innerRadius > 0.0 || accountForSliceSpacing)
             {
+                var hasZeroInnerRadius = innerRadius == 0.0
+
                 if accountForSliceSpacing
                 {
                     var minSpacedRadius = sliceSpaceRadius
@@ -833,34 +824,31 @@ open class PieChartRenderer: NSObject, DataRenderer
                 }
                 let endAngleInner = startAngleInner + sweepAngleInner
 
-                path.addLine(
-                    to: CGPoint(
-                        x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
-                        y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
-
-                path.addRelativeArc(center: center, radius: innerRadius,
-                                    startAngle: endAngleInner.DEG2RAD,
-                                    delta: -sweepAngleInner.DEG2RAD)
-            }
-            else
-            {
-                if accountForSliceSpacing
+                if sliceAngle > 180.0 && hasZeroInnerRadius && accountForSliceSpacing
                 {
-                    let angleMiddle = startAngleOuter + sweepAngleOuter / 2.0
-
-                    let arcEndPointX = center.x + sliceSpaceRadius * cos(angleMiddle.DEG2RAD)
-                    let arcEndPointY = center.y + sliceSpaceRadius * sin(angleMiddle.DEG2RAD)
+                    let midAngleInner = (startAngleInner + endAngleInner) / 2
 
                     path.addLine(
                         to: CGPoint(
-                            x: arcEndPointX,
-                            y: arcEndPointY))
+                            x: center.x + innerRadius * cos(midAngleInner.DEG2RAD),
+                            y: center.y + innerRadius * sin(midAngleInner.DEG2RAD)))
                 }
                 else
                 {
-                    path.addLine(to: center)
+                    path.addLine(
+                        to: CGPoint(
+                            x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
+                            y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
+
+                    path.addRelativeArc(center: center, radius: innerRadius,
+                                        startAngle: endAngleInner.DEG2RAD,
+                                        delta: -sweepAngleInner.DEG2RAD)
                 }
             }
+            else
+            {
+                path.addLine(to: center)
+            }
 
             path.closeSubpath()
 

Source/Charts/Utils/ChartUtils.swift

@@ -12,105 +12,75 @@
 import Foundation
 import CoreGraphics
 
-extension Comparable
-{
-    func clamped(to range: ClosedRange<Self>) -> Self
-    {
-        if self > range.upperBound
-        {
+extension Comparable {
+    func clamped(to range: ClosedRange<Self>) -> Self {
+        if self > range.upperBound {
             return range.upperBound
-        }
-        else if self < range.lowerBound
-        {
+        } else if self < range.lowerBound {
             return range.lowerBound
-        }
-        else
-        {
+        } else {
             return self
         }
     }
 }
 
-extension FloatingPoint
-{
-    var DEG2RAD: Self
-    {
+extension FloatingPoint {
+    var DEG2RAD: Self {
         return self * .pi / 180
     }
 
-    var RAD2DEG: Self
-    {
+    var RAD2DEG: Self {
         return self * 180 / .pi
     }
 
-    /// - Note: Value must be in degrees
-    /// - Returns: An angle between 0.0 < 360.0 (not less than zero, less than 360)
-    var normalizedAngle: Self
-    {
+    var normalizedAngle: Self {
         let angle = truncatingRemainder(dividingBy: 360)
         return (sign == .minus) ? angle + 360 : angle
     }
 }
 
-extension CGSize
-{
-    func rotatedBy(degrees: CGFloat) -> CGSize
-    {
+extension CGSize {
+    func rotatedBy(degrees: CGFloat) -> CGSize {
         let radians = degrees.DEG2RAD
         return rotatedBy(radians: radians)
     }
 
-    func rotatedBy(radians: CGFloat) -> CGSize
-    {
+    func rotatedBy(radians: CGFloat) -> CGSize {
         return CGSize(
             width: abs(width * cos(radians)) + abs(height * sin(radians)),
             height: abs(width * sin(radians)) + abs(height * cos(radians))
         )
     }
 }
 
-extension Double
-{
-    /// Rounds the number to the nearest multiple of it's order of magnitude, rounding away from zero if halfway.
-    func roundedToNextSignificant() -> Double
-    {
-        guard
-            !isInfinite,
-            !isNaN,
-            self != 0
-            else { return self }
+extension Double {
+    func roundedToNextSignificant() -> Double {
+        guard !isInfinite, !isNaN, self != 0 else { return self }
 
-        let d = ceil(log10(self < 0 ? -self : self))
+        // Use Foundation.log10
+        let d = ceil(Foundation.log10(self < 0 ? -self : self))
         let pw = 1 - Int(d)
-        let magnitude = pow(10.0, Double(pw))
+        
+        // Use Foundation.pow
+        let magnitude = Foundation.pow(10.0, Double(pw))
         let shifted = (self * magnitude).rounded()
         return shifted / magnitude
     }
 
-    var decimalPlaces: Int
-    {
-        guard
-            !isNaN,
-            !isInfinite,
-            self != 0.0
-            else { return 0 }
+    var decimalPlaces: Int {
+        guard !isNaN, !isInfinite, self != 0.0 else { return 0 }
 
         let i = roundedToNextSignificant()
 
-        guard
-            !i.isInfinite,
-            !i.isNaN
-            else { return 0 }
+        guard !i.isInfinite, !i.isNaN else { return 0 }
 
-        return Int(ceil(-log10(i))) + 2
+        // Use Foundation.log10
+        return Int(ceil(-Foundation.log10(i))) + 2
     }
 }
 
-extension CGPoint
-{
-    /// Calculates the position around a center point, depending on the distance from the center, and the angle of the position around the center.
-    func moving(distance: CGFloat, atAngle angle: CGFloat) -> CGPoint
-    {
+extension CGPoint {
+    func moving(distance: CGFloat, atAngle angle: CGFloat) -> CGPoint {
         return CGPoint(x: x + distance * cos(angle.DEG2RAD),
                        y: y + distance * sin(angle.DEG2RAD))
     }