Fixed issues #143, #133, #134

ChartsOrg · Jun 11, 2015 · 2ebf432 · 2ebf432
1 parent f3404bf
commit 2ebf432
Show file tree

Hide file tree

Showing 44 changed files with 70 additions and 66 deletions.
diff --git a/Charts/Classes/Animation/ChartAnimationEasing.swift b/Charts/Classes/Animation/ChartAnimationEasing.swift
@@ -13,7 +13,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 @objc
 public enum ChartEasingOption: Int

diff --git a/Charts/Classes/Charts/BarChartView.swift b/Charts/Classes/Charts/BarChartView.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 /// Chart that draws bars.
 public class BarChartView: BarLineChartViewBase, BarChartRendererDelegate

diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 import UIKit.UIGestureRecognizer
 
 /// Base-class of LineChart, BarChart, ScatterChart and CandleStickChart.

diff --git a/Charts/Classes/Charts/CandleStickChartView.swift b/Charts/Classes/Charts/CandleStickChartView.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 /// Financial chart type that draws candle-sticks.
 public class CandleStickChartView: BarLineChartViewBase, CandleStickChartRendererDelegate

diff --git a/Charts/Classes/Charts/CombinedChartView.swift b/Charts/Classes/Charts/CombinedChartView.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+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

diff --git a/Charts/Classes/Charts/LineChartView.swift b/Charts/Classes/Charts/LineChartView.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 /// Chart that draws lines, surfaces, circles, ...
 public class LineChartView: BarLineChartViewBase, LineChartRendererDelegate

diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 import UIKit.UIGestureRecognizer
 
 /// Base class of PieChartView and RadarChartView.

diff --git a/Charts/Classes/Charts/RadarChartView.swift b/Charts/Classes/Charts/RadarChartView.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 /// Implementation of the RadarChart, a "spidernet"-like chart. It works best
 /// when displaying 5-10 entries per DataSet.

diff --git a/Charts/Classes/Charts/ScatterChartView.swift b/Charts/Classes/Charts/ScatterChartView.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 /// The ScatterChart. Draws dots, triangles, squares and custom shapes into the chartview.
 public class ScatterChartView: BarLineChartViewBase, ScatterChartRendererDelegate

diff --git a/Charts/Classes/Data/BarChartData.swift b/Charts/Classes/Data/BarChartData.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 public class BarChartData: BarLineScatterCandleChartData
 {

diff --git a/Charts/Classes/Data/BarChartDataSet.swift b/Charts/Classes/Data/BarChartDataSet.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 public class BarChartDataSet: BarLineScatterCandleChartDataSet
 {

diff --git a/Charts/Classes/Data/BubbleChartData.swift b/Charts/Classes/Data/BubbleChartData.swift
@@ -9,6 +9,9 @@
 //  https://github.com/danielgindi/ios-charts
 //
 
+import Foundation
+import CoreGraphics
+
 public class BubbleChartData: BarLineScatterCandleChartData
 {
     public override init()

diff --git a/Charts/Classes/Data/BubbleChartDataEntry.swift b/Charts/Classes/Data/BubbleChartDataEntry.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 public class BubbleChartDataEntry: ChartDataEntry
 {

diff --git a/Charts/Classes/Data/BubbleChartDataSet.swift b/Charts/Classes/Data/BubbleChartDataSet.swift
@@ -10,7 +10,8 @@
 //
 
 import Foundation
-import CoreGraphics;
+import CoreGraphics
+import UIKit
 
 public class BubbleChartDataSet: BarLineScatterCandleChartDataSet
 {

diff --git a/Charts/Classes/Data/CandleChartDataSet.swift b/Charts/Classes/Data/CandleChartDataSet.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 public class CandleChartDataSet: BarLineScatterCandleChartDataSet
 {

diff --git a/Charts/Classes/Data/LineChartDataSet.swift b/Charts/Classes/Data/LineChartDataSet.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 public class LineChartDataSet: LineRadarChartDataSet
 {

diff --git a/Charts/Classes/Data/LineRadarChartDataSet.swift b/Charts/Classes/Data/LineRadarChartDataSet.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 public class LineRadarChartDataSet: BarLineScatterCandleChartDataSet
 {

diff --git a/Charts/Classes/Data/PieChartDataSet.swift b/Charts/Classes/Data/PieChartDataSet.swift
@@ -13,9 +13,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class PieChartDataSet: ChartDataSet
 {

diff --git a/Charts/Classes/Data/RadarChartData.swift b/Charts/Classes/Data/RadarChartData.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 public class RadarChartData: ChartData
 {

diff --git a/Charts/Classes/Data/RadarChartDataSet.swift b/Charts/Classes/Data/RadarChartDataSet.swift
@@ -13,7 +13,7 @@
 //
 
 import Foundation
-import UIKit.UIFont
+import UIKit
 
 public class RadarChartDataSet: LineRadarChartDataSet
 {

diff --git a/Charts/Classes/Data/ScatterChartDataSet.swift b/Charts/Classes/Data/ScatterChartDataSet.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics;
+import CoreGraphics
 
 public class ScatterChartDataSet: BarLineScatterCandleChartDataSet
 {

diff --git a/Charts/Classes/Renderers/BarChartRenderer.swift b/Charts/Classes/Renderers/BarChartRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 @objc
 public protocol BarChartRendererDelegate

diff --git a/Charts/Classes/Renderers/BubbleChartRenderer.swift b/Charts/Classes/Renderers/BubbleChartRenderer.swift
@@ -10,6 +10,8 @@
 //
 
 import Foundation
+import CoreGraphics
+import UIKit
 
 @objc
 public protocol BubbleChartRendererDelegate

diff --git a/Charts/Classes/Renderers/CandleStickChartRenderer.swift b/Charts/Classes/Renderers/CandleStickChartRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
+import CoreGraphics
+import UIKit
 
 @objc
 public protocol CandleStickChartRendererDelegate

diff --git a/Charts/Classes/Renderers/ChartDataRendererBase.swift b/Charts/Classes/Renderers/ChartDataRendererBase.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 public class ChartDataRendererBase: ChartRendererBase
 {

diff --git a/Charts/Classes/Renderers/ChartLegendRenderer.swift b/Charts/Classes/Renderers/ChartLegendRenderer.swift
@@ -12,9 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartLegendRenderer: ChartRendererBase
 {

diff --git a/Charts/Classes/Renderers/ChartRendererBase.swift b/Charts/Classes/Renderers/ChartRendererBase.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 public class ChartRendererBase: NSObject
 {

diff --git a/Charts/Classes/Renderers/ChartXAxisRenderer.swift b/Charts/Classes/Renderers/ChartXAxisRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartXAxisRenderer: ChartAxisRendererBase
 {

diff --git a/Charts/Classes/Renderers/ChartXAxisRendererBarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererBarChart.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartXAxisRendererBarChart: ChartXAxisRenderer
 {

diff --git a/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartXAxisRendererHorizontalBarChart: ChartXAxisRendererBarChart
 {

diff --git a/Charts/Classes/Renderers/ChartXAxisRendererRadarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererRadarChart.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartXAxisRendererRadarChart: ChartXAxisRenderer
 {

diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartYAxisRenderer: ChartAxisRendererBase
 {

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartYAxisRendererHorizontalBarChart: ChartYAxisRenderer
 {

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererRadarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererRadarChart.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class ChartYAxisRendererRadarChart: ChartYAxisRenderer
 {

diff --git a/Charts/Classes/Renderers/CombinedChartRenderer.swift b/Charts/Classes/Renderers/CombinedChartRenderer.swift
@@ -12,7 +12,7 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
+import CoreGraphics
 
 public class CombinedChartRenderer: ChartDataRendererBase,
     LineChartRendererDelegate,

diff --git a/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift b/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class HorizontalBarChartRenderer: BarChartRenderer
 {

diff --git a/Charts/Classes/Renderers/LineChartRenderer.swift b/Charts/Classes/Renderers/LineChartRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 @objc
 public protocol LineChartRendererDelegate

diff --git a/Charts/Classes/Renderers/PieChartRenderer.swift b/Charts/Classes/Renderers/PieChartRenderer.swift
@@ -12,9 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIColor
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class PieChartRenderer: ChartDataRendererBase
 {

diff --git a/Charts/Classes/Renderers/RadarChartRenderer.swift b/Charts/Classes/Renderers/RadarChartRenderer.swift
@@ -12,8 +12,8 @@
 //
 
 import Foundation
-import CoreGraphics.CGBase
-import UIKit.UIFont
+import CoreGraphics
+import UIKit
 
 public class RadarChartRenderer: ChartDataRendererBase
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     //
     import Foundation
+    import CoreGraphics
     public class BubbleChartDataEntry: ChartDataEntry
     {
@@ Expand Down @@