From 622da21cf5853c6cf1709a4936f741a947f5bbf8 Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Wed, 26 Apr 2017 23:47:26 +0200 Subject: [PATCH 1/2] Minor improvements in BalloonMarker.swift Getting rid of not needed String-NSString bridging --- ChartsDemo/Classes/Components/BalloonMarker.swift | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ChartsDemo/Classes/Components/BalloonMarker.swift b/ChartsDemo/Classes/Components/BalloonMarker.swift index 312c735ce0..1cade88390 100644 --- a/ChartsDemo/Classes/Components/BalloonMarker.swift +++ b/ChartsDemo/Classes/Components/BalloonMarker.swift @@ -22,7 +22,7 @@ open class BalloonMarker: MarkerImage open var insets = UIEdgeInsets() open var minimumSize = CGSize() - fileprivate var labelns: NSString? + fileprivate var label: String? fileprivate var _labelSize: CGSize = CGSize() fileprivate var _paragraphStyle: NSMutableParagraphStyle? fileprivate var _drawAttributes = [String : AnyObject]() @@ -51,10 +51,7 @@ open class BalloonMarker: MarkerImage open override func draw(context: CGContext, point: CGPoint) { - if labelns == nil - { - return - } + guard let label = label else { return } let offset = self.offsetForDrawing(atPoint: point) let size = self.size @@ -105,7 +102,7 @@ open class BalloonMarker: MarkerImage UIGraphicsPushContext(context) - labelns?.draw(in: rect, withAttributes: _drawAttributes) + label.draw(in: rect, withAttributes: _drawAttributes) UIGraphicsPopContext() @@ -117,16 +114,16 @@ open class BalloonMarker: MarkerImage setLabel(String(entry.y)) } - open func setLabel(_ label: String) + open func setLabel(_ newLabel: String) { - labelns = label as NSString + label = newLabel _drawAttributes.removeAll() _drawAttributes[NSFontAttributeName] = self.font _drawAttributes[NSParagraphStyleAttributeName] = _paragraphStyle _drawAttributes[NSForegroundColorAttributeName] = self.textColor - _labelSize = labelns?.size(attributes: _drawAttributes) ?? CGSize.zero + _labelSize = label?.size(attributes: _drawAttributes) ?? CGSize.zero var size = CGSize() size.width = _labelSize.width + self.insets.left + self.insets.right From 05702339eee62e4ab5ca4e4c254816bdb054bed4 Mon Sep 17 00:00:00 2001 From: Xuan Date: Fri, 26 May 2017 09:29:25 +0800 Subject: [PATCH 2/2] change indent --- ChartsDemo/Classes/Components/BalloonMarker.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChartsDemo/Classes/Components/BalloonMarker.swift b/ChartsDemo/Classes/Components/BalloonMarker.swift index 1cade88390..ce9284675f 100644 --- a/ChartsDemo/Classes/Components/BalloonMarker.swift +++ b/ChartsDemo/Classes/Components/BalloonMarker.swift @@ -51,7 +51,7 @@ open class BalloonMarker: MarkerImage open override func draw(context: CGContext, point: CGPoint) { - guard let label = label else { return } + guard let label = label else { return } let offset = self.offsetForDrawing(atPoint: point) let size = self.size