Merge branch 'reference-number-style' of https://github.com/Kidfund/Scrollable-GraphView into Kidfund-reference-number-style

Author: philackm

Classes/ScrollableGraphView.swift

@@ -204,6 +204,8 @@ import UIKit
     @IBInspectable public var referenceLineUnits: String?
     /// The number of decimal places that should be shown on the reference line labels.
     @IBInspectable public var referenceLineNumberOfDecimalPlaces: Int = 0
+    /// The NSNumberFormatterStyle that reference lines should use to display
+    @IBInspectable public var referenceLineNumberStyle: NSNumberFormatterStyle = .NoStyle
 
     // Data Point Labels
     // #################
@@ -506,6 +508,7 @@ import UIKit
         referenceLineView?.labelFont = self.referenceLineLabelFont
         referenceLineView?.labelColor = self.referenceLineLabelColor
         referenceLineView?.labelDecimalPlaces = self.referenceLineNumberOfDecimalPlaces
+        referenceLineView?.labelNumberStyle = self.referenceLineNumberStyle
 
         referenceLineView?.setRange(self.range)
         self.addSubview(referenceLineView!)
@@ -1629,6 +1632,7 @@ private class ReferenceLineDrawingView : UIView {
     var labelFont: UIFont = UIFont.systemFontOfSize(8)
     var labelColor: UIColor = UIColor.blackColor()
     var labelDecimalPlaces: Int = 2
+    var labelNumberStyle: NSNumberFormatterStyle = .NoStyle
 
     // PRIVATE PROPERTIES
 
@@ -1712,8 +1716,10 @@ private class ReferenceLineDrawingView : UIView {
         let minLineStart = CGPoint(x: 0, y: self.bounds.height - bottomMargin)
         let minLineEnd = CGPoint(x: lineWidth, y: self.bounds.height - bottomMargin)
 
-        let maxString = String(format: "%.\(labelDecimalPlaces)f", arguments: [self.currentRange.max]) + units
-        let minString = String(format: "%.\(labelDecimalPlaces)f", arguments: [self.currentRange.min]) + units
+        let numberFormatter = referenceNumberFormatter()
+        
+        let maxString = numberFormatter.stringFromNumber(self.currentRange.max)! + units
+        let minString = numberFormatter.stringFromNumber(self.currentRange.min)! + units
 
         addLineWithTag(maxString, from: maxLineStart, to: maxLineEnd, inPath: referenceLinePath)
         addLineWithTag(minString, from: minLineStart, to: minLineEnd, inPath: referenceLinePath)
@@ -1725,6 +1731,15 @@ private class ReferenceLineDrawingView : UIView {
         return referenceLinePath
     }
 
+    private func referenceNumberFormatter() -> NSNumberFormatter {
+        let numberFormatter = NSNumberFormatter()
+        numberFormatter.numberStyle = labelNumberStyle
+        numberFormatter.minimumFractionDigits = labelDecimalPlaces
+        numberFormatter.maximumFractionDigits = labelDecimalPlaces
+        
+        return numberFormatter
+    }
+    
     private func createIntermediateReferenceLines(rect: CGRect, numberOfIntermediateReferenceLines: Int, forPath path: UIBezierPath) {
 
         let height = rect.size.height
@@ -1773,7 +1788,8 @@ private class ReferenceLineDrawingView : UIView {
         if(shouldAddLabelsToIntermediateReferenceLines) {
 
             let value = calculateYAxisValueForPoint(lineStart)
-            var valueString = String(format: "%.\(labelDecimalPlaces)f", arguments: [value])
+            let numberFormatter = referenceNumberFormatter()
+            var valueString = numberFormatter.stringFromNumber(value)!
 
             if(shouldAddUnitsToIntermediateReferenceLineLabels) {
                 valueString += " \(units)"

README.md

@@ -173,6 +173,7 @@ The graph can be customised by setting any of the following public properties be
 | **shouldShowReferenceLineUnits**: Bool      | Whether or not to show the units on the reference lines.                                |
 | **referenceLineUnits**: String?             | The units that the y-axis is in. This string is used for labels on the reference lines. |
 | **referenceLineNumberOfDecimalPlaces**: Int | The number of decimal places that should be shown on the reference line labels.         |
+| **referenceLineNumberStyle**: NSNumberFormatterStyle | The number style that should be shown on the reference line labels.         |
 
 ### Data Point Labels (x-axis)