Chartdata collection refactor

ChartsDemo/Swift/DemoBaseViewController.swift

@@ -117,13 +117,13 @@ class DemoBaseViewController: UIViewController, ChartViewDelegate {
     func handleOption(_ option: Option, forChartView chartView: ChartViewBase) {
         switch option {
         case .toggleValues:
-            for set in chartView.data!.dataSets {
+            for set in chartView.data! {
                 set.drawValuesEnabled = !set.drawValuesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleIcons:
-            for set in chartView.data!.dataSets {
+            for set in chartView.data! {
                 set.drawIconsEnabled = !set.drawIconsEnabled
             }
             chartView.setNeedsDisplay()
@@ -159,7 +159,7 @@ class DemoBaseViewController: UIViewController, ChartViewDelegate {
             updateChartData()
 
         case .toggleBarBorders:
-            for set in chartView.data!.dataSets {
+            for set in chartView.data! {
                 if let set = set as? BarChartDataSet {
                     set.barBorderWidth = set.barBorderWidth == 1.0 ? 0.0 : 1.0
                 }

ChartsDemo/Swift/Demos/AnotherBarChartViewController.swift

@@ -66,7 +66,7 @@ class AnotherBarChartViewController: DemoBaseViewController {
         }
 
         var set1: BarChartDataSet! = nil
-        if let set = chartView.data?.dataSets.first as? BarChartDataSet {
+        if let set = chartView.data?.first as? BarChartDataSet {
             set1 = set
             set1?.values = yVals
             chartView.data?.notifyDataChanged()

ChartsDemo/Swift/Demos/BarChartViewController.swift

@@ -119,7 +119,7 @@ class BarChartViewController: DemoBaseViewController {
         }
 
         var set1: BarChartDataSet! = nil
-        if let set = chartView.data?.dataSets.first as? BarChartDataSet {
+        if let set = chartView.data?.first as? BarChartDataSet {
             set1 = set
             set1.values = yVals
             chartView.data?.notifyDataChanged()

ChartsDemo/Swift/Demos/BubbleChartViewController.swift

@@ -104,7 +104,7 @@ class BubbleChartViewController: DemoBaseViewController {
         set3.setColor(ChartColorTemplates.colorful()[2], alpha: 0.5)
         set3.drawValuesEnabled = true
 
-        let data = BubbleChartData(dataSets: [set1, set2, set3])
+        let data = [set1, set2, set3] as BubbleChartData
         data.setDrawValues(false)
         data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 7)!)
         data.setHighlightCircleWidth(1.5)

ChartsDemo/Swift/Demos/CandleStickChartViewController.swift

@@ -104,7 +104,7 @@ class CandleStickChartViewController: DemoBaseViewController {
 
     override func optionTapped(_ option: Option) {
         if .toggleShadowColorSameAsCandle ~= option {
-            for set in chartView.data!.dataSets as! [CandleChartDataSet] {
+            for set in chartView.data as! CandleChartData {
                 set.shadowColorSameAsCandle = !set.shadowColorSameAsCandle
             }
             chartView.notifyDataSetChanged()

ChartsDemo/Swift/Demos/CombinedChartViewController.swift

@@ -94,7 +94,7 @@ class CombinedChartViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleLineValues:
-            for set in chartView.data!.dataSets {
+            for set in chartView.data! {
                 if let set = set as? LineChartDataSet {
                     set.drawValuesEnabled = !set .drawValuesEnabled
 
@@ -103,7 +103,7 @@ class CombinedChartViewController: DemoBaseViewController {
             chartView.setNeedsDisplay()
 
         case .toggleBarValues:
-            for set in chartView.data!.dataSets {
+            for set in chartView.data! {
                 if let set = set as? BarChartDataSet {
                     set.drawValuesEnabled = !set .drawValuesEnabled
                 }
@@ -171,7 +171,7 @@ class CombinedChartViewController: DemoBaseViewController {
         let barWidth = 0.45 // x2 dataset
         // (0.45 + 0.02) * 2 + 0.06 = 1.00 -> interval per "group"
 
-        let data = BarChartData(dataSets: [set1, set2])
+        let data: BarChartData = [set1, set2]
         data.barWidth = barWidth
 
         // make this BarData object grouped

ChartsDemo/Swift/Demos/CubicLineChartViewController.swift

@@ -111,31 +111,31 @@ class CubicLineChartViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCircles:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawCirclesEnabled = !set.drawCirclesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
             }
             chartView.setNeedsDisplay()
 
         case .toggleStepped:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .stepped) ? .linear : .stepped
             }
             chartView.setNeedsDisplay()
 
         case .toggleHorizontalCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/LineChart1ViewController.swift

@@ -144,31 +144,31 @@ class LineChart1ViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCircles:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawCirclesEnabled = !set.drawCirclesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
             }
             chartView.setNeedsDisplay()
 
         case .toggleStepped:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .stepped) ? .linear : .stepped
             }
             chartView.setNeedsDisplay()
 
         case .toggleHorizontalCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/LineChart2ViewController.swift

@@ -135,7 +135,7 @@ class LineChart2ViewController: DemoBaseViewController {
         set3.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
         set3.drawCircleHoleEnabled = false
 
-        let data = LineChartData(dataSets: [set1, set2, set3])
+        let data: LineChartData = [set1, set2, set3]
         data.setValueTextColor(.white)
         data.setValueFont(.systemFont(ofSize: 9))
 
@@ -145,31 +145,31 @@ class LineChart2ViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCircles:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawCirclesEnabled = !set.drawCirclesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
             }
             chartView.setNeedsDisplay()
 
         case .toggleStepped:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .stepped) ? .linear : .stepped
             }
             chartView.setNeedsDisplay()
 
         case .toggleHorizontalCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/LineChartFilledViewController.swift

@@ -102,7 +102,7 @@ class LineChartFilledViewController: DemoBaseViewController {
             return CGFloat(self.chartView.leftAxis.axisMaximum)
         }
 
-        let data = LineChartData(dataSets: [set1, set2])
+        let data: LineChartData = [set1, set2]
         data.setDrawValues(false)
 
         chartView.data = data

ChartsDemo/Swift/Demos/LineChartTimeViewController.swift

@@ -120,31 +120,31 @@ class LineChartTimeViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCircles:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawCirclesEnabled = !set.drawCirclesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
             }
             chartView.setNeedsDisplay()
 
         case .toggleStepped:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .stepped) ? .linear : .stepped
             }
             chartView.setNeedsDisplay()
 
         case .toggleHorizontalCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/MultipleBarChartViewController.swift

@@ -119,7 +119,7 @@ class MultipleBarChartViewController: DemoBaseViewController {
         let set4 = BarChartDataSet(values: yVals4, label: "Company D")
         set4.setColor(UIColor(red: 255/255, green: 102/255, blue: 0/255, alpha: 1))
 
-        let data = BarChartData(dataSets: [set1, set2, set3, set4])
+        let data: BarChartData = [set1, set2, set3, set4]
         data.setValueFont(.systemFont(ofSize: 10, weight: .light))
         data.setValueFormatter(LargeValueFormatter())
 

ChartsDemo/Swift/Demos/MultipleLinesChartViewController.swift

@@ -101,25 +101,25 @@ class MultipleLinesChartViewController: DemoBaseViewController {
     override func optionTapped(_ option: Option) {
         switch option {
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCircles:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.drawCirclesEnabled = !set.drawCirclesEnabled
             }
             chartView.setNeedsDisplay()
 
         case .toggleCubic:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
             }
             chartView.setNeedsDisplay()
 
         case .toggleStepped:
-            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+            for set in chartView.data as! LineChartData {
                 set.mode = (set.mode == .stepped) ? .linear : .stepped
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/RadarChartViewController.swift

@@ -142,7 +142,7 @@ class RadarChartViewController: DemoBaseViewController {
         set2.drawHighlightCircleEnabled = true
         set2.setDrawHighlightIndicators(false)
 
-        let data = RadarChartData(dataSets: [set1, set2])
+        let data: RadarChartData = [set1, set2]
         data.setValueFont(.systemFont(ofSize: 8, weight: .light))
         data.setDrawValues(false)
         data.setValueTextColor(.white)
@@ -166,14 +166,14 @@ class RadarChartViewController: DemoBaseViewController {
             chartView.rotationEnabled = !chartView.rotationEnabled
 
         case .toggleFilled:
-            for set in chartView.data!.dataSets as! [RadarChartDataSet] {
+            for set in chartView.data as! RadarChartData {
                 set.drawFilledEnabled = !set.drawFilledEnabled
             }
 
             chartView.setNeedsDisplay()
 
         case .toggleHighlightCircle:
-            for set in chartView.data!.dataSets as! [RadarChartDataSet] {
+            for set in chartView.data as! RadarChartData {
                 set.drawHighlightCircleEnabled = !set.drawHighlightCircleEnabled
             }
             chartView.setNeedsDisplay()

ChartsDemo/Swift/Demos/ScatterChartViewController.swift

@@ -105,7 +105,7 @@ class ScatterChartViewController: DemoBaseViewController {
         set3.setColor(ChartColorTemplates.colorful()[2])
         set3.scatterShapeSize = 8
 
-        let data = ScatterChartData(dataSets: [set1, set2, set3])
+        let data: ScatterChartData = [set1, set2, set3]
         data.setValueFont(.systemFont(ofSize: 7, weight: .light))
 
         chartView.data = data

Source/Charts/Charts/ChartViewBase.swift

@@ -210,8 +210,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     /// - returns: `true` if the chart is empty (meaning it's data object is either null or contains no entries).
     @objc open func isEmpty() -> Bool
     {
-        guard let data = data else { return true }
-        return data.entryCount <= 0
+        return data?.isEmpty ?? true
     }
 
     /// Lets the chart know its underlying data has changed and should perform all necessary recalculations.
@@ -251,13 +250,11 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         }
 
 
-        if _defaultValueFormatter is DefaultValueFormatter
+        if let formatter = _defaultValueFormatter as? DefaultValueFormatter
         {
             // setup the formatter with a new number of digits
             let digits = reference.decimalPlaces
-
-            (_defaultValueFormatter as? DefaultValueFormatter)?.decimals
-             = digits
+            formatter.decimals = digits
         }
     }
 

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

@@ -43,13 +43,11 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
     /// - parameter barSpace: The space between individual bars in values (not pixels) e.g. 0.1f for bar width 1f
     @objc open func groupBars(fromX: Double, groupSpace: Double, barSpace: Double)
     {
-        let setCount = _dataSets.count
-        if setCount <= 1
-        {
+        guard !isEmpty else {
             print("BarData needs to hold at least 2 BarDataSets to allow grouping.", terminator: "\n")
             return
         }
-        
+
         let max = maxEntryCountSet
         let maxEntryCount = max?.entryCount ?? 0
 
@@ -61,7 +59,7 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
 
         let interval = groupWidth(groupSpace: groupSpace, barSpace: barSpace)
 
-        for i in stride(from: 0, to: maxEntryCount, by: 1)
+        for i in 0..<maxEntryCount
         {
             let start = fromX
             fromX += groupSpaceWidthHalf
@@ -104,7 +102,6 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
     /// - parameter barSpace:
     @objc open func groupWidth(groupSpace: Double, barSpace: Double) -> Double
     {
-        return Double(_dataSets.count) * (self.barWidth + barSpace) + groupSpace
+        return Double(count) * (self.barWidth + barSpace) + groupSpace
     }
-
 }