Added clamping function for Comparable (ChartsOrg#3435)

shineeth · Oct 31, 2018 · e9d6892 · e9d6892
1 parent c827034
commit e9d6892
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 59 deletions.
diff --git a/Source/Charts/Components/AxisBase.swift b/Source/Charts/Components/AxisBase.swift
@@ -236,17 +236,9 @@ open class AxisBase: ComponentBase
         }
         set
         {
-            _labelCount = newValue
-
-            if _labelCount > axisMaxLabels
-            {
-                _labelCount = axisMaxLabels
-            }
-            if _labelCount < axisMinLabels
-            {
-                _labelCount = axisMinLabels
-            }
-
+            let range = axisMinLabels...axisMaxLabels as ClosedRange
+            _labelCount = newValue.clamped(to: range)
+
             forceLabelsEnabled = false
         }
     }

diff --git a/Source/Charts/Components/ChartLimitLine.swift b/Source/Charts/Components/ChartLimitLine.swift
@@ -68,18 +68,7 @@ open class ChartLimitLine: ComponentBase
         }
         set
         {
-            if newValue < 0.2
-            {
-                _lineWidth = 0.2
-            }
-            else if newValue > 12.0
-            {
-                _lineWidth = 12.0
-            }
-            else
-            {
-                _lineWidth = newValue
-            }
+            _lineWidth = newValue.clamped(to: 0.2...12)
         }
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift
@@ -81,25 +81,14 @@ open class CandleChartDataSet: LineScatterCandleRadarChartDataSet, ICandleChartD
     /// **default**: 0.1 (10%), max 0.45, min 0.0
     open var barSpace: CGFloat
     {
-        set
-        {
-            if newValue < 0.0
-            {
-                _barSpace = 0.0
-            }
-            else if newValue > 0.45
-            {
-                _barSpace = 0.45
-            }
-            else
-            {
-                _barSpace = newValue
-            }
-        }
         get
         {
             return _barSpace
         }
+        set
+        {
+            _barSpace = newValue.clamped(to: 0...0.45)
+        }
     }
 
     /// should the candle bars show?

diff --git a/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
@@ -64,15 +64,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         }
         set
         {
-            _cubicIntensity = newValue
-            if _cubicIntensity > 1.0
-            {
-                _cubicIntensity = 1.0
-            }
-            if _cubicIntensity < 0.05
-            {
-                _cubicIntensity = 0.05
-            }
+            _cubicIntensity = newValue.clamped(to: 0.05...1)
         }
     }
 

diff --git a/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift
@@ -54,18 +54,7 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
         }
         set
         {
-            if newValue < 0.0
-            {
-                _lineWidth = 0.0
-            }
-            else if newValue > 10.0
-            {
-                _lineWidth = 10.0
-            }
-            else
-            {
-                _lineWidth = newValue
-            }
+            _lineWidth = newValue.clamped(to: 0...10)
         }
     }
 

diff --git a/Source/Charts/Utils/ChartUtils.swift b/Source/Charts/Utils/ChartUtils.swift
@@ -12,6 +12,18 @@
 import Foundation
 import CoreGraphics
 
+extension Comparable {
+    func clamped(to range: ClosedRange<Self>) -> Self {
+        if self > range.upperBound {
+            return range.upperBound
+        } else if self < range.lowerBound {
+            return range.lowerBound
+        } else {
+            return self
+        }
+    }
+}
+
 extension FloatingPoint
 {
     var DEG2RAD: Self