From 2ebf4324e839a390437430b690b95d157cff2f96 Mon Sep 17 00:00:00 2001 From: Daniel Cohen Gindi Date: Thu, 11 Jun 2015 10:45:10 +0300 Subject: [PATCH] Fixed issues #143, #133, #134 --- Charts/Classes/Animation/ChartAnimationEasing.swift | 2 +- Charts/Classes/Charts/BarChartView.swift | 2 +- Charts/Classes/Charts/BarLineChartViewBase.swift | 2 +- Charts/Classes/Charts/CandleStickChartView.swift | 2 +- Charts/Classes/Charts/CombinedChartView.swift | 2 +- Charts/Classes/Charts/LineChartView.swift | 2 +- Charts/Classes/Charts/PieRadarChartViewBase.swift | 2 +- Charts/Classes/Charts/RadarChartView.swift | 4 ++-- Charts/Classes/Charts/ScatterChartView.swift | 2 +- Charts/Classes/Data/BarChartData.swift | 2 +- Charts/Classes/Data/BarChartDataSet.swift | 4 ++-- Charts/Classes/Data/BubbleChartData.swift | 3 +++ Charts/Classes/Data/BubbleChartDataEntry.swift | 1 + Charts/Classes/Data/BubbleChartDataSet.swift | 3 ++- Charts/Classes/Data/CandleChartDataSet.swift | 4 ++-- Charts/Classes/Data/LineChartDataSet.swift | 4 ++-- Charts/Classes/Data/LineRadarChartDataSet.swift | 4 ++-- Charts/Classes/Data/PieChartDataSet.swift | 5 ++--- Charts/Classes/Data/RadarChartData.swift | 4 ++-- Charts/Classes/Data/RadarChartDataSet.swift | 2 +- Charts/Classes/Data/ScatterChartDataSet.swift | 2 +- Charts/Classes/Renderers/BarChartRenderer.swift | 4 ++-- Charts/Classes/Renderers/BubbleChartRenderer.swift | 2 ++ Charts/Classes/Renderers/CandleStickChartRenderer.swift | 4 ++-- Charts/Classes/Renderers/ChartDataRendererBase.swift | 2 +- Charts/Classes/Renderers/ChartLegendRenderer.swift | 5 ++--- Charts/Classes/Renderers/ChartRendererBase.swift | 2 +- Charts/Classes/Renderers/ChartXAxisRenderer.swift | 4 ++-- Charts/Classes/Renderers/ChartXAxisRendererBarChart.swift | 4 ++-- .../Renderers/ChartXAxisRendererHorizontalBarChart.swift | 4 ++-- Charts/Classes/Renderers/ChartXAxisRendererRadarChart.swift | 4 ++-- Charts/Classes/Renderers/ChartYAxisRenderer.swift | 4 ++-- .../Renderers/ChartYAxisRendererHorizontalBarChart.swift | 4 ++-- Charts/Classes/Renderers/ChartYAxisRendererRadarChart.swift | 4 ++-- Charts/Classes/Renderers/CombinedChartRenderer.swift | 2 +- Charts/Classes/Renderers/HorizontalBarChartRenderer.swift | 4 ++-- Charts/Classes/Renderers/LineChartRenderer.swift | 4 ++-- Charts/Classes/Renderers/PieChartRenderer.swift | 5 ++--- Charts/Classes/Renderers/RadarChartRenderer.swift | 4 ++-- Charts/Classes/Renderers/ScatterChartRenderer.swift | 4 ++-- Charts/Classes/Utils/ChartFillFormatter.swift | 2 +- Charts/Classes/Utils/ChartTransformer.swift | 2 +- .../Classes/Utils/ChartTransformerHorizontalBarChart.swift | 2 +- Charts/Classes/Utils/ChartViewPortHandler.swift | 2 +- 44 files changed, 70 insertions(+), 66 deletions(-) diff --git a/Charts/Classes/Animation/ChartAnimationEasing.swift b/Charts/Classes/Animation/ChartAnimationEasing.swift index 3aef551583..a06af31ba3 100644 --- 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 index b5598aa9bc..c56c84b3e0 100644 --- 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 index 5dcd2219d6..3c39c98a8a 100644 --- 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 index 6b58f3731b..f22ad97ecc 100644 --- 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 index 0eddbeb449..ba3a057d40 100644 --- 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 index 4312a38b61..67abbd072d 100644 --- 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 index b82dc8e490..cdeb1ecf71 100755 --- 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 index f2d6601203..417d171203 100644 --- 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 index c01d42d9dd..302365f9ad 100644 --- 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 index bedb1cb4bc..77c69bf272 100644 --- 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 index 42bc608fcb..5109468205 100644 --- 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 index e4ad612508..2d96f9789d 100644 --- 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 index e1914864d5..ce8020d9fd 100644 --- 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 index de1016935f..f5a468246d 100644 --- 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 index ccd0ac1ca1..d38fc1255f 100644 --- 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 index a2a20bbd97..676d1bc18f 100644 --- 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 index 2f3a4bfb4e..4518736791 100644 --- 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 index c7b038b404..b16b8d7ae2 100644 --- 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 index f75eb84502..e33d291138 100644 --- 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 index 3c296673b2..669353e7d7 100644 --- 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 index 9d87e92405..079dddd7f3 100644 --- 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 index 4636278005..6db812ccac 100644 --- 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 index 47765b2942..e8b0c3c3c3 100644 --- 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 index d86ec93f35..e09cfa60c9 100644 --- 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 index 7aaa1ed247..44bcbbcd38 100644 --- 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 index 1b4e318196..96c6bd0cc2 100755 --- 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 index 3af5240878..fcbc986215 100644 --- 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 index 1ffe38ff61..be04d1f8cf 100644 --- 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 index e551484aa0..21ee3506c2 100644 --- 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 index 223c050be9..58f72e1bcc 100644 --- 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 index e7be9383aa..4e2f5e46d1 100644 --- 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 index 5c01632031..db891e1dba 100644 --- 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 index 43ca8891fa..e36750d720 100644 --- 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 index 527ca36990..b2135f9bf6 100644 --- 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 index 3966801483..2e2540ae0b 100644 --- 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 index 3d3f67a5eb..f6a97757f0 100644 --- 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 index 1c609cfcef..70079c87c1 100644 --- 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 index 97ecef6f80..a599e32fe2 100755 --- 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 index a3785ccfee..a894d7e326 100644 --- 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 { diff --git a/Charts/Classes/Renderers/ScatterChartRenderer.swift b/Charts/Classes/Renderers/ScatterChartRenderer.swift index 073e45c958..e5862e9746 100644 --- a/Charts/Classes/Renderers/ScatterChartRenderer.swift +++ b/Charts/Classes/Renderers/ScatterChartRenderer.swift @@ -12,8 +12,8 @@ // import Foundation -import CoreGraphics.CGBase -import UIKit.UIFont +import CoreGraphics +import UIKit @objc public protocol ScatterChartRendererDelegate diff --git a/Charts/Classes/Utils/ChartFillFormatter.swift b/Charts/Classes/Utils/ChartFillFormatter.swift index 5744267ddc..1733b4c2e4 100644 --- a/Charts/Classes/Utils/ChartFillFormatter.swift +++ b/Charts/Classes/Utils/ChartFillFormatter.swift @@ -12,7 +12,7 @@ // import Foundation -import CoreGraphics.CGBase +import CoreGraphics /// Protocol for providing a custom logic to where the filling line of a DataSet should end. If setFillEnabled(...) is set to true. @objc diff --git a/Charts/Classes/Utils/ChartTransformer.swift b/Charts/Classes/Utils/ChartTransformer.swift index e31befda79..433b1c3b31 100644 --- a/Charts/Classes/Utils/ChartTransformer.swift +++ b/Charts/Classes/Utils/ChartTransformer.swift @@ -12,7 +12,7 @@ // import Foundation -import CoreGraphics.CGBase +import CoreGraphics /// Transformer class that contains all matrices and is responsible for transforming values into pixels on the screen and backwards. public class ChartTransformer: NSObject diff --git a/Charts/Classes/Utils/ChartTransformerHorizontalBarChart.swift b/Charts/Classes/Utils/ChartTransformerHorizontalBarChart.swift index 89c1527970..5cf9ad731e 100644 --- a/Charts/Classes/Utils/ChartTransformerHorizontalBarChart.swift +++ b/Charts/Classes/Utils/ChartTransformerHorizontalBarChart.swift @@ -12,7 +12,7 @@ // import Foundation -import CoreGraphics.CGBase +import CoreGraphics public class ChartTransformerHorizontalBarChart: ChartTransformer { diff --git a/Charts/Classes/Utils/ChartViewPortHandler.swift b/Charts/Classes/Utils/ChartViewPortHandler.swift index d731689735..b37a69cea1 100755 --- a/Charts/Classes/Utils/ChartViewPortHandler.swift +++ b/Charts/Classes/Utils/ChartViewPortHandler.swift @@ -12,7 +12,7 @@ // import Foundation -import CoreGraphics.CGBase +import CoreGraphics public class ChartViewPortHandler: NSObject {