From 5e143be1a7c7541c69c3190ffbad99202fdb46b2 Mon Sep 17 00:00:00 2001 From: Daniel Cohen Gindi Date: Mon, 8 Aug 2016 22:48:09 +0300 Subject: [PATCH] The highlight breaking changes are a chance to use @objc(name) feature --- Charts/Charts.xcodeproj/project.pbxproj | 112 +++++++++--------- Charts/Classes/Charts/BarChartView.swift | 6 +- Charts/Classes/Charts/ChartViewBase.swift | 22 ++-- .../Charts/HorizontalBarChartView.swift | 6 +- Charts/Classes/Charts/PieChartView.swift | 4 +- .../Charts/PieRadarChartViewBase.swift | 2 +- Charts/Classes/Charts/RadarChartView.swift | 2 +- Charts/Classes/Components/IMarker.swift | 2 +- Charts/Classes/Components/MarkerImage.swift | 2 +- Charts/Classes/Components/MarkerView.swift | 2 +- .../Standard/BarChartDataEntry.swift | 10 +- .../Implementations/Standard/ChartData.swift | 2 +- .../Standard/CombinedChartData.swift | 2 +- .../Standard/PieChartData.swift | 2 +- .../Standard/RadarChartData.swift | 2 +- ...Highlighter.swift => BarHighlighter.swift} | 27 +++-- .../Classes/Highlight/ChartHighlighter.swift | 22 ++-- .../Highlight/CombinedHighlighter.swift | 9 +- .../{ChartHighlight.swift => Highlight.swift} | 5 +- ...r.swift => HorizontalBarHighlighter.swift} | 9 +- .../Classes/Highlight/IChartHighlighter.swift | 2 +- ...Highlighter.swift => PieHighlighter.swift} | 7 +- ...ighter.swift => PieRadarHighlighter.swift} | 7 +- ...ghlighter.swift => RadarHighlighter.swift} | 13 +- .../{ChartRange.swift => Range.swift} | 3 +- .../Classes/Renderers/BarChartRenderer.swift | 4 +- .../Renderers/BubbleChartRenderer.swift | 2 +- .../Renderers/CandleStickChartRenderer.swift | 2 +- .../Renderers/ChartDataRendererBase.swift | 2 +- .../Renderers/CombinedChartRenderer.swift | 2 +- .../HorizontalBarChartRenderer.swift | 2 +- .../Classes/Renderers/LineChartRenderer.swift | 2 +- .../Classes/Renderers/PieChartRenderer.swift | 2 +- .../Renderers/RadarChartRenderer.swift | 2 +- .../Renderers/ScatterChartRenderer.swift | 2 +- .../Classes/Components/BalloonMarker.swift | 2 +- .../Classes/Components/RadarMarkerView.swift | 2 +- 37 files changed, 158 insertions(+), 150 deletions(-) rename Charts/Classes/Highlight/{BarChartHighlighter.swift => BarHighlighter.swift} (82%) rename Charts/Classes/Highlight/{ChartHighlight.swift => Highlight.swift} (98%) rename Charts/Classes/Highlight/{HorizontalBarChartHighlighter.swift => HorizontalBarHighlighter.swift} (86%) rename Charts/Classes/Highlight/{PieChartHighlighter.swift => PieHighlighter.swift} (72%) rename Charts/Classes/Highlight/{PieRadarChartHighlighter.swift => PieRadarHighlighter.swift} (93%) rename Charts/Classes/Highlight/{RadarChartHighlighter.swift => RadarHighlighter.swift} (84%) rename Charts/Classes/Highlight/{ChartRange.swift => Range.swift} (95%) diff --git a/Charts/Charts.xcodeproj/project.pbxproj b/Charts/Charts.xcodeproj/project.pbxproj index c361abc19f..388b8fc891 100644 --- a/Charts/Charts.xcodeproj/project.pbxproj +++ b/Charts/Charts.xcodeproj/project.pbxproj @@ -23,11 +23,11 @@ 559726461BDABC0500E05E59 /* ScatterChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C57B1BCDBF6C00462351 /* ScatterChartDataProvider.swift */; }; 55E356531ADC63BF00A57971 /* BubbleChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E356521ADC63BF00A57971 /* BubbleChartView.swift */; }; 55E3565B1ADC63EB00A57971 /* BubbleChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3565A1ADC63EB00A57971 /* BubbleChartRenderer.swift */; }; - 5B0032451B6524AD00B6A2FE /* ChartHighlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* ChartHighlight.swift */; }; - 5B0032471B6524D300B6A2FE /* ChartRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* ChartRange.swift */; }; + 5B0032451B6524AD00B6A2FE /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* Highlight.swift */; }; + 5B0032471B6524D300B6A2FE /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* Range.swift */; }; 5B0032491B6525FC00B6A2FE /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */; }; - 5B00324B1B652BF900B6A2FE /* BarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarChartHighlighter.swift */; }; - 5B00324D1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift */; }; + 5B00324B1B652BF900B6A2FE /* BarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarHighlighter.swift */; }; + 5B00324D1B65351C00B6A2FE /* HorizontalBarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarHighlighter.swift */; }; 5B185BFF1D390C4800B9A953 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B185BFE1D390C4800B9A953 /* PieChartDataEntry.swift */; }; 5B185C001D390C4800B9A953 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B185BFE1D390C4800B9A953 /* PieChartDataEntry.swift */; }; 5B185C011D390C4800B9A953 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B185BFE1D390C4800B9A953 /* PieChartDataEntry.swift */; }; @@ -46,15 +46,15 @@ 5B613D8F1D50DEE8000F1E98 /* CombinedChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D8E1D50DEE8000F1E98 /* CombinedChartDataProvider.swift */; }; 5B613D901D50DEE8000F1E98 /* CombinedChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D8E1D50DEE8000F1E98 /* CombinedChartDataProvider.swift */; }; 5B613D911D50DEE8000F1E98 /* CombinedChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D8E1D50DEE8000F1E98 /* CombinedChartDataProvider.swift */; }; - 5B613D931D50E360000F1E98 /* PieRadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarChartHighlighter.swift */; }; - 5B613D941D50E361000F1E98 /* PieRadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarChartHighlighter.swift */; }; - 5B613D951D50E361000F1E98 /* PieRadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarChartHighlighter.swift */; }; - 5B613D981D50E597000F1E98 /* PieChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieChartHighlighter.swift */; }; - 5B613D991D50E597000F1E98 /* PieChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieChartHighlighter.swift */; }; - 5B613D9A1D50E597000F1E98 /* PieChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieChartHighlighter.swift */; }; - 5B613D9B1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarChartHighlighter.swift */; }; - 5B613D9C1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarChartHighlighter.swift */; }; - 5B613D9D1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarChartHighlighter.swift */; }; + 5B613D931D50E360000F1E98 /* PieRadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarHighlighter.swift */; }; + 5B613D941D50E361000F1E98 /* PieRadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarHighlighter.swift */; }; + 5B613D951D50E361000F1E98 /* PieRadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D921D50E360000F1E98 /* PieRadarHighlighter.swift */; }; + 5B613D981D50E597000F1E98 /* PieHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieHighlighter.swift */; }; + 5B613D991D50E597000F1E98 /* PieHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieHighlighter.swift */; }; + 5B613D9A1D50E597000F1E98 /* PieHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D961D50E597000F1E98 /* PieHighlighter.swift */; }; + 5B613D9B1D50E597000F1E98 /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarHighlighter.swift */; }; + 5B613D9C1D50E597000F1E98 /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarHighlighter.swift */; }; + 5B613D9D1D50E597000F1E98 /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D971D50E597000F1E98 /* RadarHighlighter.swift */; }; 5B613D9F1D50EC5D000F1E98 /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D9E1D50EC5D000F1E98 /* RadarChartDataEntry.swift */; }; 5B613DA01D50EC5D000F1E98 /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D9E1D50EC5D000F1E98 /* RadarChartDataEntry.swift */; }; 5B613DA11D50EC5D000F1E98 /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613D9E1D50EC5D000F1E98 /* RadarChartDataEntry.swift */; }; @@ -284,12 +284,12 @@ 65B3F6031C7370E5000983D0 /* ChartDefaultFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8E0AAD1C63737400438BAF /* ChartDefaultFillFormatter.swift */; }; 65B3F6041C7370E5000983D0 /* ChartDefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D51BB0A86F00890030 /* ChartDefaultAxisValueFormatter.swift */; }; 65B3F6051C7370E5000983D0 /* ChartFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* ChartFillFormatter.swift */; }; - 65B3F6071C7370E5000983D0 /* ChartHighlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* ChartHighlight.swift */; }; - 65B3F6081C7370E5000983D0 /* ChartRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* ChartRange.swift */; }; + 65B3F6071C7370E5000983D0 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* Highlight.swift */; }; + 65B3F6081C7370E5000983D0 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* Range.swift */; }; 65B3F6091C7370E5000983D0 /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */; }; - 65B3F60A1C7370E5000983D0 /* BarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarChartHighlighter.swift */; }; + 65B3F60A1C7370E5000983D0 /* BarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarHighlighter.swift */; }; 65B3F60B1C7370E5000983D0 /* CombinedHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAAA8551BB08E1D00B20D4D /* CombinedHighlighter.swift */; }; - 65B3F60C1C7370E5000983D0 /* HorizontalBarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift */; }; + 65B3F60C1C7370E5000983D0 /* HorizontalBarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarHighlighter.swift */; }; 65B3F60D1C7370E5000983D0 /* BarChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C5751BCDBF6C00462351 /* BarChartDataProvider.swift */; }; 65B3F60E1C7370E5000983D0 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C5761BCDBF6C00462351 /* BarLineScatterCandleBubbleChartDataProvider.swift */; }; 65B3F60F1C7370E5000983D0 /* BubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C5771BCDBF6C00462351 /* BubbleChartDataProvider.swift */; }; @@ -374,11 +374,11 @@ A52C5C521BAC5D1100594CDD /* ChartXAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC6D1A9D151C00CE82E1 /* ChartXAxis.swift */; }; A52C5C531BAC5D1100594CDD /* ChartYAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC6E1A9D151C00CE82E1 /* ChartYAxis.swift */; }; A52C5C6D1BAC5D1100594CDD /* ChartDataApproximator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC751A9D151C00CE82E1 /* ChartDataApproximator.swift */; }; - A52C5C6F1BAC5D1100594CDD /* ChartHighlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* ChartHighlight.swift */; }; - A52C5C701BAC5D1100594CDD /* ChartRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* ChartRange.swift */; }; + A52C5C6F1BAC5D1100594CDD /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* Highlight.swift */; }; + A52C5C701BAC5D1100594CDD /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* Range.swift */; }; A52C5C711BAC5D1100594CDD /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */; }; - A52C5C721BAC5D1100594CDD /* BarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarChartHighlighter.swift */; }; - A52C5C731BAC5D1100594CDD /* HorizontalBarChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift */; }; + A52C5C721BAC5D1100594CDD /* BarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324A1B652BF900B6A2FE /* BarHighlighter.swift */; }; + A52C5C731BAC5D1100594CDD /* HorizontalBarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B00324C1B65351C00B6A2FE /* HorizontalBarHighlighter.swift */; }; A52C5C741BAC5D1100594CDD /* ChartAxisRendererBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6A54711AA5DCA8000F57C2 /* ChartAxisRendererBase.swift */; }; A52C5C751BAC5D1100594CDD /* BarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6A54961AA66AD2000F57C2 /* BarChartRenderer.swift */; }; A52C5C761BAC5D1100594CDD /* BubbleChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3565A1ADC63EB00A57971 /* BubbleChartRenderer.swift */; }; @@ -437,11 +437,11 @@ 06AEE7C11BDC4277009875AE /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = ""; }; 55E356521ADC63BF00A57971 /* BubbleChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartView.swift; sourceTree = ""; }; 55E3565A1ADC63EB00A57971 /* BubbleChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartRenderer.swift; sourceTree = ""; }; - 5B0032441B6524AD00B6A2FE /* ChartHighlight.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartHighlight.swift; sourceTree = ""; }; - 5B0032461B6524D300B6A2FE /* ChartRange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartRange.swift; sourceTree = ""; }; + 5B0032441B6524AD00B6A2FE /* Highlight.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Highlight.swift; sourceTree = ""; }; + 5B0032461B6524D300B6A2FE /* Range.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Range.swift; sourceTree = ""; }; 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartHighlighter.swift; sourceTree = ""; }; - 5B00324A1B652BF900B6A2FE /* BarChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartHighlighter.swift; sourceTree = ""; }; - 5B00324C1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalBarChartHighlighter.swift; sourceTree = ""; }; + 5B00324A1B652BF900B6A2FE /* BarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarHighlighter.swift; sourceTree = ""; }; + 5B00324C1B65351C00B6A2FE /* HorizontalBarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalBarHighlighter.swift; sourceTree = ""; }; 5B185BFE1D390C4800B9A953 /* PieChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartDataEntry.swift; sourceTree = ""; }; 5B378F161AD500A4009414A4 /* ChartAnimationEasing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAnimationEasing.swift; sourceTree = ""; }; 5B4AC1711C4AB2AF0028D1A6 /* ChartBaseDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartBaseDataSet.swift; sourceTree = ""; }; @@ -450,9 +450,9 @@ 5B4BCD3F1AA9C4930063F019 /* ChartTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartTransformer.swift; sourceTree = ""; }; 5B613D8A1D50CDB5000F1E98 /* IChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IChartHighlighter.swift; sourceTree = ""; }; 5B613D8E1D50DEE8000F1E98 /* CombinedChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedChartDataProvider.swift; sourceTree = ""; }; - 5B613D921D50E360000F1E98 /* PieRadarChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieRadarChartHighlighter.swift; sourceTree = ""; }; - 5B613D961D50E597000F1E98 /* PieChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartHighlighter.swift; sourceTree = ""; }; - 5B613D971D50E597000F1E98 /* RadarChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartHighlighter.swift; sourceTree = ""; }; + 5B613D921D50E360000F1E98 /* PieRadarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieRadarHighlighter.swift; sourceTree = ""; }; + 5B613D961D50E597000F1E98 /* PieHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieHighlighter.swift; sourceTree = ""; }; + 5B613D971D50E597000F1E98 /* RadarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarHighlighter.swift; sourceTree = ""; }; 5B613D9E1D50EC5D000F1E98 /* RadarChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartDataEntry.swift; sourceTree = ""; }; 5B613DAA1D526B60000F1E98 /* MarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkerView.swift; sourceTree = ""; }; 5B613DAE1D526BBF000F1E98 /* MarkerImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkerImage.swift; sourceTree = ""; }; @@ -645,15 +645,15 @@ isa = PBXGroup; children = ( 5B613D8A1D50CDB5000F1E98 /* IChartHighlighter.swift */, - 5B0032441B6524AD00B6A2FE /* ChartHighlight.swift */, - 5B0032461B6524D300B6A2FE /* ChartRange.swift */, + 5B0032441B6524AD00B6A2FE /* Highlight.swift */, + 5B0032461B6524D300B6A2FE /* Range.swift */, 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */, - 5B00324A1B652BF900B6A2FE /* BarChartHighlighter.swift */, + 5B00324A1B652BF900B6A2FE /* BarHighlighter.swift */, 5BAAA8551BB08E1D00B20D4D /* CombinedHighlighter.swift */, - 5B00324C1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift */, - 5B613D961D50E597000F1E98 /* PieChartHighlighter.swift */, - 5B613D921D50E360000F1E98 /* PieRadarChartHighlighter.swift */, - 5B613D971D50E597000F1E98 /* RadarChartHighlighter.swift */, + 5B00324C1B65351C00B6A2FE /* HorizontalBarHighlighter.swift */, + 5B613D961D50E597000F1E98 /* PieHighlighter.swift */, + 5B613D921D50E360000F1E98 /* PieRadarHighlighter.swift */, + 5B613D971D50E597000F1E98 /* RadarHighlighter.swift */, ); path = Highlight; sourceTree = ""; @@ -1161,7 +1161,7 @@ 5B6A548F1AA66A7A000F57C2 /* HorizontalBarChartRenderer.swift in Sources */, 5B6A54741AA5DEDC000F57C2 /* ChartXAxisRenderer.swift in Sources */, 5B4AC1721C4AB2AF0028D1A6 /* ChartBaseDataSet.swift in Sources */, - 5B613D9B1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */, + 5B613D9B1D50E597000F1E98 /* RadarHighlighter.swift in Sources */, 5BD4C57F1BCDBF6C00462351 /* CandleChartDataProvider.swift in Sources */, 5B6A547C1AA5DF02000F57C2 /* ChartXAxisRendererHorizontalBarChart.swift in Sources */, 659400A41BF463C1004F9C27 /* BarChartDataSet.swift in Sources */, @@ -1169,8 +1169,8 @@ 659400BA1BF463C1004F9C27 /* ChartDataSet.swift in Sources */, 5B6A54801AA5DF28000F57C2 /* ChartYAxisRendererHorizontalBarChart.swift in Sources */, 65F06FA71BE817560074498D /* ICandleChartDataSet.swift in Sources */, - 5B613D981D50E597000F1E98 /* PieChartHighlighter.swift in Sources */, - 5B00324D1B65351C00B6A2FE /* HorizontalBarChartHighlighter.swift in Sources */, + 5B613D981D50E597000F1E98 /* PieHighlighter.swift in Sources */, + 5B00324D1B65351C00B6A2FE /* HorizontalBarHighlighter.swift in Sources */, 65F06FB01BE826090074498D /* IRadarChartDataSet.swift in Sources */, 659400C61BF463C1004F9C27 /* PieChartData.swift in Sources */, 5B6A54871AA669F4000F57C2 /* RadarChartRenderer.swift in Sources */, @@ -1212,7 +1212,7 @@ 5BD4C5801BCDBF6C00462351 /* ChartDataProvider.swift in Sources */, 5BD4C57C1BCDBF6C00462351 /* BarChartDataProvider.swift in Sources */, 5B0032491B6525FC00B6A2FE /* ChartHighlighter.swift in Sources */, - 5B00324B1B652BF900B6A2FE /* BarChartHighlighter.swift in Sources */, + 5B00324B1B652BF900B6A2FE /* BarHighlighter.swift in Sources */, 65F06F9A1BE8136F0074498D /* ILineRadarChartDataSet.swift in Sources */, 5B9D74191C688BDD00267DDD /* ChartDefaultFillFormatter.swift in Sources */, 5B613DDA1D5466CE000F1E98 /* TriangleShapeRenderer.swift in Sources */, @@ -1226,7 +1226,7 @@ 659400AE1BF463C1004F9C27 /* BubbleChartDataSet.swift in Sources */, 55E3565B1ADC63EB00A57971 /* BubbleChartRenderer.swift in Sources */, 65F06FA11BE815220074498D /* IBubbleChartDataSet.swift in Sources */, - 5B613D931D50E360000F1E98 /* PieRadarChartHighlighter.swift in Sources */, + 5B613D931D50E360000F1E98 /* PieRadarHighlighter.swift in Sources */, 55E356531ADC63BF00A57971 /* BubbleChartView.swift in Sources */, 5B613D9F1D50EC5D000F1E98 /* RadarChartDataEntry.swift in Sources */, 659400B01BF463C1004F9C27 /* CandleChartData.swift in Sources */, @@ -1243,11 +1243,11 @@ 5B6556F71AB72BA000FFBFD3 /* ChartComponentBase.swift in Sources */, 5B680D2A1A9D17C30026A057 /* ChartUtils.swift in Sources */, 659400C81BF463C1004F9C27 /* PieChartDataSet.swift in Sources */, - 5B0032451B6524AD00B6A2FE /* ChartHighlight.swift in Sources */, + 5B0032451B6524AD00B6A2FE /* Highlight.swift in Sources */, 65F06F8E1BE807040074498D /* IChartDataSet.swift in Sources */, 5B680D201A9D17C30026A057 /* ChartLegend.swift in Sources */, 5BCAA7561C7CB0DE00F83F3B /* AnimatedZoomViewJob.swift in Sources */, - 5B0032471B6524D300B6A2FE /* ChartRange.swift in Sources */, + 5B0032471B6524D300B6A2FE /* Range.swift in Sources */, 5BD8F06E1AB89AD800566E05 /* HorizontalBarChartView.swift in Sources */, 5BE377E01D44A17A006EB34F /* ChartAxisValueFormatter.swift in Sources */, ); @@ -1269,7 +1269,7 @@ 65B3F5CE1C7370E5000983D0 /* CombinedChartView.swift in Sources */, 65B3F5CF1C7370E5000983D0 /* HorizontalBarChartView.swift in Sources */, 65B3F5D01C7370E5000983D0 /* LineChartView.swift in Sources */, - 5B613D9A1D50E597000F1E98 /* PieChartHighlighter.swift in Sources */, + 5B613D9A1D50E597000F1E98 /* PieHighlighter.swift in Sources */, 65B3F5D11C7370E5000983D0 /* PieChartView.swift in Sources */, 5B613DD91D5466CE000F1E98 /* SquareShapeRenderer.swift in Sources */, 65B3F5D21C7370E5000983D0 /* PieRadarChartViewBase.swift in Sources */, @@ -1334,16 +1334,16 @@ 5B72BF951D490FDD0009B2C7 /* BarLineScatterCandleBubbleChartRenderer.swift in Sources */, 65B3F6041C7370E5000983D0 /* ChartDefaultAxisValueFormatter.swift in Sources */, 65B3F6051C7370E5000983D0 /* ChartFillFormatter.swift in Sources */, - 65B3F6071C7370E5000983D0 /* ChartHighlight.swift in Sources */, - 65B3F6081C7370E5000983D0 /* ChartRange.swift in Sources */, + 65B3F6071C7370E5000983D0 /* Highlight.swift in Sources */, + 65B3F6081C7370E5000983D0 /* Range.swift in Sources */, 5B9A0C291C83A7E200ED8ED8 /* AnimatedZoomViewJob.swift in Sources */, 65B3F6091C7370E5000983D0 /* ChartHighlighter.swift in Sources */, 5BE377EB1D44D6D0006EB34F /* ChartDataEntryBase.swift in Sources */, 5B9A0C261C83A7E200ED8ED8 /* ZoomChartViewJob.swift in Sources */, - 65B3F60A1C7370E5000983D0 /* BarChartHighlighter.swift in Sources */, + 65B3F60A1C7370E5000983D0 /* BarHighlighter.swift in Sources */, 65B3F60B1C7370E5000983D0 /* CombinedHighlighter.swift in Sources */, - 5B613D9D1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */, - 65B3F60C1C7370E5000983D0 /* HorizontalBarChartHighlighter.swift in Sources */, + 5B613D9D1D50E597000F1E98 /* RadarHighlighter.swift in Sources */, + 65B3F60C1C7370E5000983D0 /* HorizontalBarHighlighter.swift in Sources */, 65B3F60D1C7370E5000983D0 /* BarChartDataProvider.swift in Sources */, 65B3F60E1C7370E5000983D0 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */, 65B3F60F1C7370E5000983D0 /* BubbleChartDataProvider.swift in Sources */, @@ -1377,7 +1377,7 @@ 65B3F6271C7370E5000983D0 /* ChartYAxisRenderer.swift in Sources */, 65B3F6281C7370E5000983D0 /* ChartYAxisRendererHorizontalBarChart.swift in Sources */, 65B3F6291C7370E5000983D0 /* ChartYAxisRendererRadarChart.swift in Sources */, - 5B613D951D50E361000F1E98 /* PieRadarChartHighlighter.swift in Sources */, + 5B613D951D50E361000F1E98 /* PieRadarHighlighter.swift in Sources */, 65B3F62A1C7370E5000983D0 /* ChartColorTemplates.swift in Sources */, 65B3F62B1C7370E5000983D0 /* ChartFill.swift in Sources */, 65B3F62D1C7370E5000983D0 /* ChartTransformer.swift in Sources */, @@ -1404,7 +1404,7 @@ 659400C51BF463C1004F9C27 /* LineScatterCandleRadarChartDataSet.swift in Sources */, 559726411BDABC0500E05E59 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */, 659400BF1BF463C1004F9C27 /* LineChartData.swift in Sources */, - 5B613D991D50E597000F1E98 /* PieChartHighlighter.swift in Sources */, + 5B613D991D50E597000F1E98 /* PieHighlighter.swift in Sources */, 559726421BDABC0500E05E59 /* BubbleChartDataProvider.swift in Sources */, 5B613DD81D5466CE000F1E98 /* SquareShapeRenderer.swift in Sources */, 559726431BDABC0500E05E59 /* CandleChartDataProvider.swift in Sources */, @@ -1460,16 +1460,16 @@ A52C5C6D1BAC5D1100594CDD /* ChartDataApproximator.swift in Sources */, 659400A11BF463C1004F9C27 /* BarChartData.swift in Sources */, 65B3F6331C739F7F000983D0 /* ChartPlatform.swift in Sources */, - A52C5C6F1BAC5D1100594CDD /* ChartHighlight.swift in Sources */, + A52C5C6F1BAC5D1100594CDD /* Highlight.swift in Sources */, 659400AD1BF463C1004F9C27 /* BubbleChartDataEntry.swift in Sources */, 5B613DCF1D5466CE000F1E98 /* CircleShapeRenderer.swift in Sources */, - A52C5C701BAC5D1100594CDD /* ChartRange.swift in Sources */, + A52C5C701BAC5D1100594CDD /* Range.swift in Sources */, 5B613DCC1D5466CE000F1E98 /* ChevronUpShapeRenderer.swift in Sources */, A52C5C711BAC5D1100594CDD /* ChartHighlighter.swift in Sources */, 5B72BF941D490FDD0009B2C7 /* BarLineScatterCandleBubbleChartRenderer.swift in Sources */, 65F06FAE1BE826010074498D /* IPieChartDataSet.swift in Sources */, - A52C5C721BAC5D1100594CDD /* BarChartHighlighter.swift in Sources */, - A52C5C731BAC5D1100594CDD /* HorizontalBarChartHighlighter.swift in Sources */, + A52C5C721BAC5D1100594CDD /* BarHighlighter.swift in Sources */, + A52C5C731BAC5D1100594CDD /* HorizontalBarHighlighter.swift in Sources */, 5B4AC1CE1C58F55B0028D1A6 /* LineRadarChartRenderer.swift in Sources */, A52C5C741BAC5D1100594CDD /* ChartAxisRendererBase.swift in Sources */, A52C5C751BAC5D1100594CDD /* BarChartRenderer.swift in Sources */, @@ -1477,7 +1477,7 @@ A52C5C761BAC5D1100594CDD /* BubbleChartRenderer.swift in Sources */, A52C5C771BAC5D1100594CDD /* CandleStickChartRenderer.swift in Sources */, 65F06F9F1BE814800074498D /* IScatterChartDataSet.swift in Sources */, - 5B613D9C1D50E597000F1E98 /* RadarChartHighlighter.swift in Sources */, + 5B613D9C1D50E597000F1E98 /* RadarHighlighter.swift in Sources */, 5BCAA7541C7CB03900F83F3B /* AnimatedMoveViewJob.swift in Sources */, A52C5C781BAC5D1100594CDD /* CombinedChartRenderer.swift in Sources */, A52C5C791BAC5D1100594CDD /* ChartDataRendererBase.swift in Sources */, @@ -1512,7 +1512,7 @@ A52C5C881BAC5D1200594CDD /* ChartYAxisRendererRadarChart.swift in Sources */, A52C5C891BAC5D1200594CDD /* ChartColorTemplates.swift in Sources */, 659400C91BF463C1004F9C27 /* PieChartDataSet.swift in Sources */, - 5B613D941D50E361000F1E98 /* PieRadarChartHighlighter.swift in Sources */, + 5B613D941D50E361000F1E98 /* PieRadarHighlighter.swift in Sources */, 65F06F8F1BE807040074498D /* IChartDataSet.swift in Sources */, A52C5C8C1BAC5D1200594CDD /* ChartTransformer.swift in Sources */, A52C5C8D1BAC5D1200594CDD /* ChartTransformerHorizontalBarChart.swift in Sources */, diff --git a/Charts/Classes/Charts/BarChartView.swift b/Charts/Classes/Charts/BarChartView.swift index d189f3edf7..6f095fb038 100644 --- a/Charts/Classes/Charts/BarChartView.swift +++ b/Charts/Classes/Charts/BarChartView.swift @@ -29,7 +29,7 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider renderer = BarChartRenderer(dataProvider: self, animator: _animator, viewPortHandler: _viewPortHandler) - self.highlighter = BarChartHighlighter(chart: self) + self.highlighter = BarHighlighter(chart: self) } internal override func calcMinMax() @@ -63,7 +63,7 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider } /// - returns: The Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the BarChart. - public override func getHighlightByTouchPoint(pt: CGPoint) -> ChartHighlight? + public override func getHighlightByTouchPoint(pt: CGPoint) -> Highlight? { if _data === nil { @@ -125,7 +125,7 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider /// - parameter stackIndex: the index inside the stack - only relevant for stacked entries public func highlightValue(x x: Double, dataSetIndex: Int, stackIndex: Int) { - highlightValue(ChartHighlight(x: x, dataSetIndex: dataSetIndex, stackIndex: stackIndex)) + highlightValue(Highlight(x: x, dataSetIndex: dataSetIndex, stackIndex: stackIndex)) } // MARK: Accessors diff --git a/Charts/Classes/Charts/ChartViewBase.swift b/Charts/Classes/Charts/ChartViewBase.swift index 6683e1cfce..a53d7b703d 100755 --- a/Charts/Classes/Charts/ChartViewBase.swift +++ b/Charts/Classes/Charts/ChartViewBase.swift @@ -26,7 +26,7 @@ public protocol ChartViewDelegate /// Called when a value has been selected inside the chart. /// - parameter entry: The selected Entry. /// - parameter highlight: The corresponding highlight object that contains information about the highlighted position such as dataSetIndex etc. - optional func chartValueSelected(chartView: ChartViewBase, entry: ChartDataEntry, highlight: ChartHighlight) + optional func chartValueSelected(chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight) // Called when nothing has been selected or an "un-select" has been made. optional func chartValueNothingSelected(chartView: ChartViewBase) @@ -123,7 +123,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate private var _offsetsCalculated = false /// array of Highlight objects that reference the highlighted slices in the chart - internal var _indicesToHighlight = [ChartHighlight]() + internal var _indicesToHighlight = [Highlight]() /// `true` if drawing the marker is enabled when tapping on values /// (use the `marker` property to specify a marker) @@ -401,7 +401,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate // MARK: - Highlighting /// - returns: The array of currently highlighted values. This might an empty if nothing is highlighted. - public var highlighted: [ChartHighlight] + public var highlighted: [Highlight] { return _indicesToHighlight } @@ -432,10 +432,10 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate /// null or an empty array to undo all highlighting. /// This should be used to programmatically highlight values. /// This DOES NOT generate a callback to the delegate. - public func highlightValues(highs: [ChartHighlight]?) + public func highlightValues(highs: [Highlight]?) { // set the indices to highlight - _indicesToHighlight = highs ?? [ChartHighlight]() + _indicesToHighlight = highs ?? [Highlight]() if (_indicesToHighlight.isEmpty) { @@ -454,7 +454,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate /// Highlights the values represented by the provided Highlight object /// This DOES NOT generate a callback to the delegate. /// - parameter highlight: contains information about which entry should be highlighted - public func highlightValue(highlight: ChartHighlight?) + public func highlightValue(highlight: Highlight?) { highlightValue(highlight: highlight, callDelegate: false) } @@ -482,12 +482,12 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate } else { - highlightValue(highlight: ChartHighlight(x: x, dataSetIndex: dataSetIndex), callDelegate: callDelegate) + highlightValue(highlight: Highlight(x: x, dataSetIndex: dataSetIndex), callDelegate: callDelegate) } } /// Highlights the value selected by touch gesture. - public func highlightValue(highlight highlight: ChartHighlight?, callDelegate: Bool) + public func highlightValue(highlight highlight: Highlight?, callDelegate: Bool) { var entry: ChartDataEntry? var h = highlight @@ -531,7 +531,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate /// - returns: The Highlight object (contains x-index and DataSet index) of the /// selected value at the given touch point inside the Line-, Scatter-, or /// CandleStick-Chart. - public func getHighlightByTouchPoint(pt: CGPoint) -> ChartHighlight? + public func getHighlightByTouchPoint(pt: CGPoint) -> Highlight? { if _data === nil { @@ -543,7 +543,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate } /// The last value that was highlighted via touch. - public var lastHighlighted: ChartHighlight? + public var lastHighlighted: Highlight? // MARK: - Markers @@ -589,7 +589,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate } /// - returns: The actual position in pixels of the MarkerView for the given Entry in the given DataSet. - public func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint + public func getMarkerPosition(highlight highlight: Highlight) -> CGPoint { return CGPoint(x: highlight.drawX, y: highlight.drawY) } diff --git a/Charts/Classes/Charts/HorizontalBarChartView.swift b/Charts/Classes/Charts/HorizontalBarChartView.swift index 5fee33d369..f1d228d87e 100644 --- a/Charts/Classes/Charts/HorizontalBarChartView.swift +++ b/Charts/Classes/Charts/HorizontalBarChartView.swift @@ -33,7 +33,7 @@ public class HorizontalBarChartView: BarChartView _rightYAxisRenderer = ChartYAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, yAxis: _rightAxis, transformer: _rightAxisTransformer) _xAxisRenderer = ChartXAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer, chart: self) - self.highlighter = HorizontalBarChartHighlighter(chart: self) + self.highlighter = HorizontalBarHighlighter(chart: self) } internal override func calculateOffsets() @@ -100,7 +100,7 @@ public class HorizontalBarChartView: BarChartView _leftAxisTransformer.prepareMatrixValuePx(chartXMin: _leftAxis._axisMinimum, deltaX: CGFloat(_leftAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum) } - public override func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint + public override func getMarkerPosition(highlight highlight: Highlight) -> CGPoint { return CGPoint(x: highlight.drawY, y: highlight.drawX) } @@ -138,7 +138,7 @@ public class HorizontalBarChartView: BarChartView return vals } - public override func getHighlightByTouchPoint(pt: CGPoint) -> ChartHighlight? + public override func getHighlightByTouchPoint(pt: CGPoint) -> Highlight? { if _data === nil { diff --git a/Charts/Classes/Charts/PieChartView.swift b/Charts/Classes/Charts/PieChartView.swift index 9fd8d03fbd..3a94877232 100755 --- a/Charts/Classes/Charts/PieChartView.swift +++ b/Charts/Classes/Charts/PieChartView.swift @@ -91,7 +91,7 @@ public class PieChartView: PieRadarChartViewBase renderer = PieChartRenderer(chart: self, animator: _animator, viewPortHandler: _viewPortHandler) _xAxis = nil - self.highlighter = PieChartHighlighter(chart: self) + self.highlighter = PieHighlighter(chart: self) } public override func drawRect(rect: CGRect) @@ -152,7 +152,7 @@ public class PieChartView: PieRadarChartViewBase calcAngles() } - public override func getMarkerPosition(highlight highlight: ChartHighlight) -> CGPoint + public override func getMarkerPosition(highlight highlight: Highlight) -> CGPoint { let center = self.centerCircleBox var r = self.radius diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift index e2e721bab7..9f705dd6db 100755 --- a/Charts/Classes/Charts/PieRadarChartViewBase.swift +++ b/Charts/Classes/Charts/PieRadarChartViewBase.swift @@ -821,7 +821,7 @@ public class PieRadarChartViewBase: ChartViewBase } /// reference to the last highlighted object - private var _lastHighlight: ChartHighlight! + private var _lastHighlight: Highlight! @objc private func tapGestureRecognized(recognizer: NSUITapGestureRecognizer) { diff --git a/Charts/Classes/Charts/RadarChartView.swift b/Charts/Classes/Charts/RadarChartView.swift index 6c77326bde..f1f0fc5197 100644 --- a/Charts/Classes/Charts/RadarChartView.swift +++ b/Charts/Classes/Charts/RadarChartView.swift @@ -67,7 +67,7 @@ public class RadarChartView: PieRadarChartViewBase _yAxisRenderer = ChartYAxisRendererRadarChart(viewPortHandler: _viewPortHandler, yAxis: _yAxis, chart: self) _xAxisRenderer = ChartXAxisRendererRadarChart(viewPortHandler: _viewPortHandler, xAxis: _xAxis, chart: self) - self.highlighter = RadarChartHighlighter(chart: self) + self.highlighter = RadarHighlighter(chart: self) } internal override func calcMinMax() diff --git a/Charts/Classes/Components/IMarker.swift b/Charts/Classes/Components/IMarker.swift index 625a08246f..55be5adf38 100644 --- a/Charts/Classes/Components/IMarker.swift +++ b/Charts/Classes/Components/IMarker.swift @@ -32,7 +32,7 @@ public protocol IMarker: NSObjectProtocol /// /// - parameter entry: The Entry the IMarker belongs to. This can also be any subclass of Entry, like BarEntry or CandleEntry, simply cast it at runtime. /// - parameter highlight: The highlight object contains information about the highlighted value such as it's dataset-index, the selected range or stack-index (only stacked bar entries). - func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + func refreshContent(entry entry: ChartDataEntry, highlight: Highlight) /// Draws the IMarker on the given position on the given context func draw(context context: CGContext, point: CGPoint) diff --git a/Charts/Classes/Components/MarkerImage.swift b/Charts/Classes/Components/MarkerImage.swift index 1efdbb910a..71f0061015 100644 --- a/Charts/Classes/Components/MarkerImage.swift +++ b/Charts/Classes/Components/MarkerImage.swift @@ -75,7 +75,7 @@ public class MarkerImage: NSObject, IMarker return offset } - public func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + public func refreshContent(entry entry: ChartDataEntry, highlight: Highlight) { // Do nothing here... } diff --git a/Charts/Classes/Components/MarkerView.swift b/Charts/Classes/Components/MarkerView.swift index ffdda25502..ed0322caf0 100644 --- a/Charts/Classes/Components/MarkerView.swift +++ b/Charts/Classes/Components/MarkerView.swift @@ -53,7 +53,7 @@ public class MarkerView: NSUIView, IMarker return offset } - public func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + public func refreshContent(entry entry: ChartDataEntry, highlight: Highlight) { // Do nothing here... } diff --git a/Charts/Classes/Data/Implementations/Standard/BarChartDataEntry.swift b/Charts/Classes/Data/Implementations/Standard/BarChartDataEntry.swift index 3f065b0332..61528f08aa 100644 --- a/Charts/Classes/Data/Implementations/Standard/BarChartDataEntry.swift +++ b/Charts/Classes/Data/Implementations/Standard/BarChartDataEntry.swift @@ -19,7 +19,7 @@ public class BarChartDataEntry: ChartDataEntry private var _yVals: [Double]? /// the ranges for the individual stack values - automatically calculated - private var _ranges: [ChartRange]? + private var _ranges: [Range]? /// the sum of all negative values this entry (if stacked) contains private var _negativeSum: Double = 0.0 @@ -134,7 +134,7 @@ public class BarChartDataEntry: ChartDataEntry if _ranges == nil { - _ranges = [ChartRange]() + _ranges = [Range]() } else { @@ -152,12 +152,12 @@ public class BarChartDataEntry: ChartDataEntry if value < 0 { - _ranges?.append(ChartRange(from: negRemain, to: negRemain + abs(value))) + _ranges?.append(Range(from: negRemain, to: negRemain + abs(value))) negRemain += abs(value) } else { - _ranges?.append(ChartRange(from: posRemain, to: posRemain+value)) + _ranges?.append(Range(from: posRemain, to: posRemain+value)) posRemain += value } } @@ -182,7 +182,7 @@ public class BarChartDataEntry: ChartDataEntry } /// - returns: The ranges of the individual stack-entries. Will return null if this entry is not stacked. - public var ranges: [ChartRange]? + public var ranges: [Range]? { return _ranges } diff --git a/Charts/Classes/Data/Implementations/Standard/ChartData.swift b/Charts/Classes/Data/Implementations/Standard/ChartData.swift index f5dd5bc1a7..ba823ec093 100644 --- a/Charts/Classes/Data/Implementations/Standard/ChartData.swift +++ b/Charts/Classes/Data/Implementations/Standard/ChartData.swift @@ -392,7 +392,7 @@ public class ChartData: NSObject /// /// - parameter highlight: /// - returns: The entry that is highlighted - public func entryForHighlight(highlight: ChartHighlight) -> ChartDataEntry? + public func entryForHighlight(highlight: Highlight) -> ChartDataEntry? { if highlight.dataSetIndex >= dataSets.count { diff --git a/Charts/Classes/Data/Implementations/Standard/CombinedChartData.swift b/Charts/Classes/Data/Implementations/Standard/CombinedChartData.swift index c0ad942cb2..bb36d78983 100644 --- a/Charts/Classes/Data/Implementations/Standard/CombinedChartData.swift +++ b/Charts/Classes/Data/Implementations/Standard/CombinedChartData.swift @@ -268,7 +268,7 @@ public class CombinedChartData: BarLineScatterCandleBubbleChartData /// /// - parameter highlight: /// - returns: The entry that is highlighted - public override func entryForHighlight(highlight: ChartHighlight) -> ChartDataEntry? + public override func entryForHighlight(highlight: Highlight) -> ChartDataEntry? { let dataObjects = allData diff --git a/Charts/Classes/Data/Implementations/Standard/PieChartData.swift b/Charts/Classes/Data/Implementations/Standard/PieChartData.swift index 3b975ba0b0..0f83af9937 100644 --- a/Charts/Classes/Data/Implementations/Standard/PieChartData.swift +++ b/Charts/Classes/Data/Implementations/Standard/PieChartData.swift @@ -77,7 +77,7 @@ public class PieChartData: ChartData return nil } - public override func entryForHighlight(highlight: ChartHighlight) -> ChartDataEntry? + public override func entryForHighlight(highlight: Highlight) -> ChartDataEntry? { return dataSet?.entryForIndex(Int(highlight.x)) } diff --git a/Charts/Classes/Data/Implementations/Standard/RadarChartData.swift b/Charts/Classes/Data/Implementations/Standard/RadarChartData.swift index dafb0ac6d0..ece33235fb 100644 --- a/Charts/Classes/Data/Implementations/Standard/RadarChartData.swift +++ b/Charts/Classes/Data/Implementations/Standard/RadarChartData.swift @@ -41,7 +41,7 @@ public class RadarChartData: ChartData super.init(dataSets: dataSets) } - public override func entryForHighlight(highlight: ChartHighlight) -> ChartDataEntry? + public override func entryForHighlight(highlight: Highlight) -> ChartDataEntry? { return getDataSetByIndex(highlight.dataSetIndex)?.entryForIndex(Int(highlight.x)) } diff --git a/Charts/Classes/Highlight/BarChartHighlighter.swift b/Charts/Classes/Highlight/BarHighlighter.swift similarity index 82% rename from Charts/Classes/Highlight/BarChartHighlighter.swift rename to Charts/Classes/Highlight/BarHighlighter.swift index d7f531b789..c8e5f79e52 100644 --- a/Charts/Classes/Highlight/BarChartHighlighter.swift +++ b/Charts/Classes/Highlight/BarHighlighter.swift @@ -15,9 +15,10 @@ import Foundation import CoreGraphics -public class BarChartHighlighter: ChartHighlighter +@objc(BarChartHighlighter) +public class BarHighlighter: ChartHighlighter { - public override func getHighlight(x x: CGFloat, y: CGFloat) -> ChartHighlight? + public override func getHighlight(x x: CGFloat, y: CGFloat) -> Highlight? { let high = super.getHighlight(x: x, y: y) @@ -55,10 +56,10 @@ public class BarChartHighlighter: ChartHighlighter /// - parameter xIndex: /// - parameter yValue: /// - returns: - public func getStackedHighlight(high high: ChartHighlight, + public func getStackedHighlight(high high: Highlight, set: IBarChartDataSet, xValue: Double, - yValue: Double) -> ChartHighlight? + yValue: Double) -> Highlight? { guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider, @@ -79,14 +80,14 @@ public class BarChartHighlighter: ChartHighlighter let pixel = chart .getTransformer(set.axisDependency) .pixelForValues(x: high.x, y: ranges[stackIndex].to) - - return ChartHighlight(x: entry.x, - y: entry.y, - xPx: pixel.x, - yPx: pixel.y, - dataSetIndex: high.dataSetIndex, - stackIndex: stackIndex, - axis: high.axis) + + return Highlight(x: entry.x, + y: entry.y, + xPx: pixel.x, + yPx: pixel.y, + dataSetIndex: high.dataSetIndex, + stackIndex: stackIndex, + axis: high.axis) } return nil @@ -96,7 +97,7 @@ public class BarChartHighlighter: ChartHighlighter /// - parameter entry: /// - parameter value: /// - returns: - public func getClosestStackIndex(ranges ranges: [ChartRange]?, value: Double) -> Int + public func getClosestStackIndex(ranges ranges: [Range]?, value: Double) -> Int { if ranges == nil { diff --git a/Charts/Classes/Highlight/ChartHighlighter.swift b/Charts/Classes/Highlight/ChartHighlighter.swift index 43873098cf..71aac7429a 100644 --- a/Charts/Classes/Highlight/ChartHighlighter.swift +++ b/Charts/Classes/Highlight/ChartHighlighter.swift @@ -25,7 +25,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter self.chart = chart } - public func getHighlight(x x: CGFloat, y: CGFloat) -> ChartHighlight? + public func getHighlight(x x: CGFloat, y: CGFloat) -> Highlight? { let xVal = Double(getValsForTouch(x: x, y: y).x) @@ -49,7 +49,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter /// - parameter x: /// - parameter y: /// - returns: - public func getHighlight(xValue xVal: Double, x: CGFloat, y: CGFloat) -> ChartHighlight? + public func getHighlight(xValue xVal: Double, x: CGFloat, y: CGFloat) -> Highlight? { guard let chart = chart else { return nil } @@ -76,9 +76,9 @@ public class ChartHighlighter : NSObject, IChartHighlighter /// - parameter x: touch position /// - parameter y: touch position /// - returns: - public func getHighlights(xValue xValue: Double, x: CGFloat, y: CGFloat) -> [ChartHighlight] + public func getHighlights(xValue xValue: Double, x: CGFloat, y: CGFloat) -> [Highlight] { - var vals = [ChartHighlight]() + var vals = [Highlight]() guard let data = self.chart?.data @@ -111,7 +111,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter dataSet set: IChartDataSet, dataSetIndex: Int, xValue: Double, - rounding: ChartDataSetRounding) -> ChartHighlight? + rounding: ChartDataSetRounding) -> Highlight? { guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider else { return nil } @@ -120,7 +120,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter { let px = chart.getTransformer(set.axisDependency).pixelForValues(x: e.x, y: e.y) - return ChartHighlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency) + return Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency) } return nil @@ -130,14 +130,14 @@ public class ChartHighlighter : NSObject, IChartHighlighter /// - returns: The `ChartHighlight` of the closest value on the x-y cartesian axes internal func closestSelectionDetailByPixel( - closestValues closestValues: [ChartHighlight], + closestValues closestValues: [Highlight], x: CGFloat, y: CGFloat, axis: ChartYAxis.AxisDependency?, - minSelectionDistance: CGFloat) -> ChartHighlight? + minSelectionDistance: CGFloat) -> Highlight? { var distance = minSelectionDistance - var closest: ChartHighlight? + var closest: Highlight? for i in 0 ..< closestValues.count { @@ -160,7 +160,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter /// - returns: The minimum distance from a touch-y-value (in pixels) to the closest y-value (in pixels) that is displayed in the chart. internal func getMinimumDistance( - closestValues: [ChartHighlight], + closestValues: [Highlight], y: CGFloat, axis: ChartYAxis.AxisDependency) -> CGFloat { @@ -183,7 +183,7 @@ public class ChartHighlighter : NSObject, IChartHighlighter return distance } - internal func getHighlightPos(high high: ChartHighlight) -> CGFloat + internal func getHighlightPos(high high: Highlight) -> CGFloat { return high.yPx } diff --git a/Charts/Classes/Highlight/CombinedHighlighter.swift b/Charts/Classes/Highlight/CombinedHighlighter.swift index 649261b912..16f4148e47 100644 --- a/Charts/Classes/Highlight/CombinedHighlighter.swift +++ b/Charts/Classes/Highlight/CombinedHighlighter.swift @@ -15,22 +15,23 @@ import Foundation import CoreGraphics +@objc(CombinedChartHighlighter) public class CombinedHighlighter: ChartHighlighter { /// bar highlighter for supporting stacked highlighting - private var barHighlighter: BarChartHighlighter? + private var barHighlighter: BarHighlighter? public init(chart: CombinedChartDataProvider, barDataProvider: BarChartDataProvider) { super.init(chart: chart) // if there is BarData, create a BarHighlighter - self.barHighlighter = barDataProvider.barData == nil ? nil : BarChartHighlighter(chart: barDataProvider) + self.barHighlighter = barDataProvider.barData == nil ? nil : BarHighlighter(chart: barDataProvider) } - public override func getHighlights(xValue xValue: Double, x: CGFloat, y: CGFloat) -> [ChartHighlight] + public override func getHighlights(xValue xValue: Double, x: CGFloat, y: CGFloat) -> [Highlight] { - var vals = [ChartHighlight]() + var vals = [Highlight]() guard let chart = self.chart as? CombinedChartDataProvider else { return vals } diff --git a/Charts/Classes/Highlight/ChartHighlight.swift b/Charts/Classes/Highlight/Highlight.swift similarity index 98% rename from Charts/Classes/Highlight/ChartHighlight.swift rename to Charts/Classes/Highlight/Highlight.swift index 8571f8c9c6..8d7a33a83b 100644 --- a/Charts/Classes/Highlight/ChartHighlight.swift +++ b/Charts/Classes/Highlight/Highlight.swift @@ -14,7 +14,8 @@ import Foundation -public class ChartHighlight: NSObject +@objc(ChartHighlight) +public class Highlight: NSObject { /// the x-value of the highlighted value private var _x = Double.NaN @@ -215,7 +216,7 @@ public class ChartHighlight: NSObject } } -func ==(lhs: ChartHighlight, rhs: ChartHighlight) -> Bool +func ==(lhs: Highlight, rhs: Highlight) -> Bool { if (lhs === rhs) { diff --git a/Charts/Classes/Highlight/HorizontalBarChartHighlighter.swift b/Charts/Classes/Highlight/HorizontalBarHighlighter.swift similarity index 86% rename from Charts/Classes/Highlight/HorizontalBarChartHighlighter.swift rename to Charts/Classes/Highlight/HorizontalBarHighlighter.swift index dfc566e0ae..a720c9a625 100644 --- a/Charts/Classes/Highlight/HorizontalBarChartHighlighter.swift +++ b/Charts/Classes/Highlight/HorizontalBarHighlighter.swift @@ -15,9 +15,10 @@ import Foundation import CoreGraphics -public class HorizontalBarChartHighlighter: BarChartHighlighter +@objc(HorizontalBarChartHighlighter) +public class HorizontalBarHighlighter: BarHighlighter { - public override func getHighlight(x x: CGFloat, y: CGFloat) -> ChartHighlight? + public override func getHighlight(x x: CGFloat, y: CGFloat) -> Highlight? { if let barData = self.chart?.data as? BarChartData { @@ -44,7 +45,7 @@ public class HorizontalBarChartHighlighter: BarChartHighlighter dataSet set: IChartDataSet, dataSetIndex: Int, xValue: Double, - rounding: ChartDataSetRounding) -> ChartHighlight? + rounding: ChartDataSetRounding) -> Highlight? { guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider else { return nil } @@ -53,7 +54,7 @@ public class HorizontalBarChartHighlighter: BarChartHighlighter { let px = chart.getTransformer(set.axisDependency).pixelForValues(x: e.y, y: e.x) - return ChartHighlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y,dataSetIndex: dataSetIndex, axis: set.axisDependency) + return Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y,dataSetIndex: dataSetIndex, axis: set.axisDependency) } return nil diff --git a/Charts/Classes/Highlight/IChartHighlighter.swift b/Charts/Classes/Highlight/IChartHighlighter.swift index 9e66fa2e0b..32457062ea 100644 --- a/Charts/Classes/Highlight/IChartHighlighter.swift +++ b/Charts/Classes/Highlight/IChartHighlighter.swift @@ -19,5 +19,5 @@ public protocol IChartHighlighter : NSObjectProtocol /// - parameter x: /// - parameter y: /// - returns: - func getHighlight(x x: CGFloat, y: CGFloat) -> ChartHighlight? + func getHighlight(x x: CGFloat, y: CGFloat) -> Highlight? } diff --git a/Charts/Classes/Highlight/PieChartHighlighter.swift b/Charts/Classes/Highlight/PieHighlighter.swift similarity index 72% rename from Charts/Classes/Highlight/PieChartHighlighter.swift rename to Charts/Classes/Highlight/PieHighlighter.swift index 68afe204ab..e9c66f60a1 100644 --- a/Charts/Classes/Highlight/PieChartHighlighter.swift +++ b/Charts/Classes/Highlight/PieHighlighter.swift @@ -15,9 +15,10 @@ import Foundation import CoreGraphics -public class PieChartHighlighter: PieRadarChartHighlighter +@objc(PieChartHighlighter) +public class PieHighlighter: PieRadarHighlighter { - public override func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> ChartHighlight? + public override func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> Highlight? { guard let set = chart?.data?.dataSets[0] else { return nil } @@ -25,6 +26,6 @@ public class PieChartHighlighter: PieRadarChartHighlighter guard let entry = set.entryForIndex(index) else { return nil } - return ChartHighlight(x: Double(index), y: entry.y, xPx: x, yPx: y, dataSetIndex: 0, axis: set.axisDependency) + return Highlight(x: Double(index), y: entry.y, xPx: x, yPx: y, dataSetIndex: 0, axis: set.axisDependency) } } diff --git a/Charts/Classes/Highlight/PieRadarChartHighlighter.swift b/Charts/Classes/Highlight/PieRadarHighlighter.swift similarity index 93% rename from Charts/Classes/Highlight/PieRadarChartHighlighter.swift rename to Charts/Classes/Highlight/PieRadarHighlighter.swift index 2f503ecd13..2874e421f0 100644 --- a/Charts/Classes/Highlight/PieRadarChartHighlighter.swift +++ b/Charts/Classes/Highlight/PieRadarHighlighter.swift @@ -15,9 +15,10 @@ import Foundation import CoreGraphics -public class PieRadarChartHighlighter: ChartHighlighter +@objc(PieRadarChartHighlighter) +public class PieRadarHighlighter: ChartHighlighter { - public override func getHighlight(x x: CGFloat, y: CGFloat) -> ChartHighlight? + public override func getHighlight(x x: CGFloat, y: CGFloat) -> Highlight? { guard let chart = self.chart as? PieRadarChartViewBase else { return nil } @@ -57,7 +58,7 @@ public class PieRadarChartHighlighter: ChartHighlighter /// - parameter index: /// - parameter x: /// - parameter y: - public func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> ChartHighlight? + public func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> Highlight? { fatalError("closestHighlight(index, x, y) cannot be called on PieRadarChartHighlighter") } diff --git a/Charts/Classes/Highlight/RadarChartHighlighter.swift b/Charts/Classes/Highlight/RadarHighlighter.swift similarity index 84% rename from Charts/Classes/Highlight/RadarChartHighlighter.swift rename to Charts/Classes/Highlight/RadarHighlighter.swift index 5a5b13c65d..bdb24b425a 100644 --- a/Charts/Classes/Highlight/RadarChartHighlighter.swift +++ b/Charts/Classes/Highlight/RadarHighlighter.swift @@ -15,9 +15,10 @@ import Foundation import CoreGraphics -public class RadarChartHighlighter: PieRadarChartHighlighter +@objc(RadarChartHighlighter) +public class RadarHighlighter: PieRadarHighlighter { - public override func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> ChartHighlight? + public override func closestHighlight(index index: Int, x: CGFloat, y: CGFloat) -> Highlight? { guard let chart = self.chart as? RadarChartView else { return nil } @@ -26,7 +27,7 @@ public class RadarChartHighlighter: PieRadarChartHighlighter let distanceToCenter = Double(chart.distanceToCenter(x: x, y: y) / chart.factor) - var closest: ChartHighlight? = nil + var closest: Highlight? = nil var distance = DBL_MAX for high in highlights @@ -46,9 +47,9 @@ public class RadarChartHighlighter: PieRadarChartHighlighter /// The Highlight objects give information about the value at the selected index and DataSet it belongs to. /// /// - parameter index: - internal func getHighlights(index index: Int) -> [ChartHighlight] + internal func getHighlights(index index: Int) -> [Highlight] { - var vals = [ChartHighlight]() + var vals = [Highlight]() guard let chart = self.chart as? RadarChartView else { return vals } @@ -73,7 +74,7 @@ public class RadarChartHighlighter: PieRadarChartHighlighter dist: CGFloat(y) * factor * CGFloat(phaseY), angle: sliceangle * CGFloat(index) * CGFloat(phaseX) + chart.rotationAngle) - vals.append(ChartHighlight(x: Double(index), y: entry.y, xPx: p.x, yPx: p.y, dataSetIndex: i, axis: dataSet.axisDependency)) + vals.append(Highlight(x: Double(index), y: entry.y, xPx: p.x, yPx: p.y, dataSetIndex: i, axis: dataSet.axisDependency)) } return vals diff --git a/Charts/Classes/Highlight/ChartRange.swift b/Charts/Classes/Highlight/Range.swift similarity index 95% rename from Charts/Classes/Highlight/ChartRange.swift rename to Charts/Classes/Highlight/Range.swift index 1bff26ee2c..59ceaccbea 100644 --- a/Charts/Classes/Highlight/ChartRange.swift +++ b/Charts/Classes/Highlight/Range.swift @@ -14,7 +14,8 @@ import Foundation -public class ChartRange: NSObject +@objc(ChartRange) +public class Range: NSObject { public var from: Double public var to: Double diff --git a/Charts/Classes/Renderers/BarChartRenderer.swift b/Charts/Classes/Renderers/BarChartRenderer.swift index 78ba429e2f..8fb721a81c 100644 --- a/Charts/Classes/Renderers/BarChartRenderer.swift +++ b/Charts/Classes/Renderers/BarChartRenderer.swift @@ -541,7 +541,7 @@ public class BarChartRenderer: BarLineScatterCandleBubbleChartRenderer } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let dataProvider = dataProvider, @@ -608,7 +608,7 @@ public class BarChartRenderer: BarLineScatterCandleBubbleChartRenderer } /// Sets the drawing position of the highlight object based on the riven bar-rect. - internal func setHighlightDrawPos(highlight high: ChartHighlight, barRect: CGRect) + internal func setHighlightDrawPos(highlight high: Highlight, barRect: CGRect) { high.setDraw(x: barRect.midX, y: barRect.origin.y) } diff --git a/Charts/Classes/Renderers/BubbleChartRenderer.swift b/Charts/Classes/Renderers/BubbleChartRenderer.swift index b75733b015..67d1b78658 100644 --- a/Charts/Classes/Renderers/BubbleChartRenderer.swift +++ b/Charts/Classes/Renderers/BubbleChartRenderer.swift @@ -211,7 +211,7 @@ public class BubbleChartRenderer: BarLineScatterCandleBubbleChartRenderer } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let dataProvider = dataProvider, diff --git a/Charts/Classes/Renderers/CandleStickChartRenderer.swift b/Charts/Classes/Renderers/CandleStickChartRenderer.swift index a823814959..25c945fcdc 100644 --- a/Charts/Classes/Renderers/CandleStickChartRenderer.swift +++ b/Charts/Classes/Renderers/CandleStickChartRenderer.swift @@ -312,7 +312,7 @@ public class CandleStickChartRenderer: LineScatterCandleRadarChartRenderer { } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let dataProvider = dataProvider, diff --git a/Charts/Classes/Renderers/ChartDataRendererBase.swift b/Charts/Classes/Renderers/ChartDataRendererBase.swift index 56e74e9be0..aaf6dee7cb 100644 --- a/Charts/Classes/Renderers/ChartDataRendererBase.swift +++ b/Charts/Classes/Renderers/ChartDataRendererBase.swift @@ -43,7 +43,7 @@ public class ChartDataRendererBase: ChartRendererBase /// Draws all highlight indicators for the values that are currently highlighted. /// /// - parameter indices: the highlighted values - public func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public func drawHighlighted(context context: CGContext, indices: [Highlight]) { fatalError("drawHighlighted() cannot be called on ChartDataRendererBase") } diff --git a/Charts/Classes/Renderers/CombinedChartRenderer.swift b/Charts/Classes/Renderers/CombinedChartRenderer.swift index 4748f1bc4f..3b2c8b7c1c 100644 --- a/Charts/Classes/Renderers/CombinedChartRenderer.swift +++ b/Charts/Classes/Renderers/CombinedChartRenderer.swift @@ -123,7 +123,7 @@ public class CombinedChartRenderer: ChartDataRendererBase } } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { for renderer in _renderers { diff --git a/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift b/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift index 5a03646b5e..58a00b9206 100644 --- a/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift +++ b/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift @@ -537,7 +537,7 @@ public class HorizontalBarChartRenderer: BarChartRenderer } /// Sets the drawing position of the highlight object based on the riven bar-rect. - internal override func setHighlightDrawPos(highlight high: ChartHighlight, barRect: CGRect) + internal override func setHighlightDrawPos(highlight high: Highlight, barRect: CGRect) { high.setDraw(x: barRect.midY, y: barRect.origin.x + barRect.size.width) } diff --git a/Charts/Classes/Renderers/LineChartRenderer.swift b/Charts/Classes/Renderers/LineChartRenderer.swift index 8c52e40246..bddd86070a 100644 --- a/Charts/Classes/Renderers/LineChartRenderer.swift +++ b/Charts/Classes/Renderers/LineChartRenderer.swift @@ -675,7 +675,7 @@ public class LineChartRenderer: LineRadarChartRenderer CGContextRestoreGState(context) } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let dataProvider = dataProvider, diff --git a/Charts/Classes/Renderers/PieChartRenderer.swift b/Charts/Classes/Renderers/PieChartRenderer.swift index a2cc2fb217..e2d8e8c4c0 100755 --- a/Charts/Classes/Renderers/PieChartRenderer.swift +++ b/Charts/Classes/Renderers/PieChartRenderer.swift @@ -657,7 +657,7 @@ public class PieChartRenderer: ChartDataRendererBase } } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let chart = chart, diff --git a/Charts/Classes/Renderers/RadarChartRenderer.swift b/Charts/Classes/Renderers/RadarChartRenderer.swift index 0446a55899..00156a2af8 100644 --- a/Charts/Classes/Renderers/RadarChartRenderer.swift +++ b/Charts/Classes/Renderers/RadarChartRenderer.swift @@ -273,7 +273,7 @@ public class RadarChartRenderer: LineRadarChartRenderer private var _highlightPointBuffer = CGPoint() - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let chart = chart, diff --git a/Charts/Classes/Renderers/ScatterChartRenderer.swift b/Charts/Classes/Renderers/ScatterChartRenderer.swift index 8e61abe7f5..21e8d5dbfd 100644 --- a/Charts/Classes/Renderers/ScatterChartRenderer.swift +++ b/Charts/Classes/Renderers/ScatterChartRenderer.swift @@ -184,7 +184,7 @@ public class ScatterChartRenderer: LineScatterCandleRadarChartRenderer } - public override func drawHighlighted(context context: CGContext, indices: [ChartHighlight]) + public override func drawHighlighted(context context: CGContext, indices: [Highlight]) { guard let dataProvider = dataProvider, diff --git a/ChartsDemo/Classes/Components/BalloonMarker.swift b/ChartsDemo/Classes/Components/BalloonMarker.swift index 2b7aa89f2a..ac0eaac5df 100644 --- a/ChartsDemo/Classes/Components/BalloonMarker.swift +++ b/ChartsDemo/Classes/Components/BalloonMarker.swift @@ -97,7 +97,7 @@ public class BalloonMarker: MarkerImage CGContextRestoreGState(context) } - public override func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + public override func refreshContent(entry entry: ChartDataEntry, highlight: Highlight) { let label = entry.y.description labelns = label as NSString diff --git a/ChartsDemo/Classes/Components/RadarMarkerView.swift b/ChartsDemo/Classes/Components/RadarMarkerView.swift index 4a49db3ce3..c6a7a157fb 100644 --- a/ChartsDemo/Classes/Components/RadarMarkerView.swift +++ b/ChartsDemo/Classes/Components/RadarMarkerView.swift @@ -22,7 +22,7 @@ public class RadarMarkerView: MarkerView self.offset.y = -self.frame.size.height - 7.0 } - public override func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + public override func refreshContent(entry entry: ChartDataEntry, highlight: Highlight) { label?.text = String.init(format: "%d %%", Int(round(entry.y))) layoutIfNeeded()