From 8cf8d1aad782f7766be3fd41b0341c6c7de20905 Mon Sep 17 00:00:00 2001 From: adonaire-sage Date: Wed, 25 Nov 2015 15:52:49 +0100 Subject: [PATCH] Make getBarBounds callable from Objective-C code (Fixes #570) Changed method return value to nonnull, because CGRect in Objective-C doesn't allow nil since it's not an object. When the bar bounds cannot be calculated because the data set is nil now the method returns CGRectNull instead of nil. --- Charts/Classes/Charts/BarChartView.swift | 4 ++-- Charts/Classes/Charts/HorizontalBarChartView.swift | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Charts/Classes/Charts/BarChartView.swift b/Charts/Classes/Charts/BarChartView.swift index f25aea3659..5501c2fac8 100644 --- a/Charts/Classes/Charts/BarChartView.swift +++ b/Charts/Classes/Charts/BarChartView.swift @@ -73,13 +73,13 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider } /// - returns: the bounding box of the specified Entry in the specified DataSet. Returns null if the Entry could not be found in the charts data. - public func getBarBounds(e: BarChartDataEntry) -> CGRect! + public func getBarBounds(e: BarChartDataEntry) -> CGRect { let set = _data.getDataSetForEntry(e) as! BarChartDataSet! if (set === nil) { - return nil + return CGRectNull } let barspace = set.barSpace diff --git a/Charts/Classes/Charts/HorizontalBarChartView.swift b/Charts/Classes/Charts/HorizontalBarChartView.swift index 4f05841592..56edbc416b 100644 --- a/Charts/Classes/Charts/HorizontalBarChartView.swift +++ b/Charts/Classes/Charts/HorizontalBarChartView.swift @@ -138,13 +138,13 @@ public class HorizontalBarChartView: BarChartView } } - public override func getBarBounds(e: BarChartDataEntry) -> CGRect! + public override func getBarBounds(e: BarChartDataEntry) -> CGRect { let set = _data.getDataSetForEntry(e) as! BarChartDataSet! if (set === nil) { - return nil + return CGRectNull } let barspace = set.barSpace @@ -205,4 +205,4 @@ public class HorizontalBarChartView: BarChartView return Int((pt.y >= CGFloat(chartXMax)) ? CGFloat(chartXMax) / div : (pt.y / div)) } -} \ No newline at end of file +}