Use Swift count instead of lengthOfBytes (Issue #120)

ChartsOrg · Jun 2, 2015 · fd82163 · fd82163
1 parent 18a3c50
commit fd82163
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/Charts/Classes/Charts/ChartViewBase.swift b/Charts/Classes/Charts/ChartViewBase.swift
@@ -301,7 +301,7 @@ public class ChartViewBase: UIView, ChartAnimatorDelegate
 
             ChartUtils.drawText(context: context, text: noDataText, point: CGPoint(x: frame.width / 2.0, y: frame.height / 2.0), align: .Center, attributes: [NSFontAttributeName: infoFont, NSForegroundColorAttributeName: infoTextColor]);
 
-            if (noDataTextDescription?.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+            if (noDataTextDescription != nil && count(noDataTextDescription!) > 0)
             {   
                 var textOffset = -infoFont.lineHeight / 2.0;
 

diff --git a/Charts/Classes/Components/ChartXAxis.swift b/Charts/Classes/Components/ChartXAxis.swift
@@ -79,7 +79,7 @@ public class ChartXAxis: ChartAxisBase
         {
             var text = values[i];
 
-            if (text != nil && longest.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) < text!.lengthOfBytesUsingEncoding(NSUTF16StringEncoding))
+            if (text != nil && count(longest) < count(text!))
             {
                 longest = text!;
             }

diff --git a/Charts/Classes/Components/ChartYAxis.swift b/Charts/Classes/Components/ChartYAxis.swift
@@ -179,7 +179,7 @@ public class ChartYAxis: ChartAxisBase
         {
             var text = getFormattedLabel(i);
 
-            if (longest.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) < text.lengthOfBytesUsingEncoding(NSUTF16StringEncoding))
+            if (count(longest) < count(text))
             {
                 longest = text;
             }

diff --git a/Charts/Classes/Data/ChartData.swift b/Charts/Classes/Data/ChartData.swift
@@ -110,7 +110,7 @@ public class ChartData: NSObject
 
         for (var i = 0; i < _xVals.count; i++)
         {
-            sum += _xVals[i] == nil ? 0 : _xVals[i]!.lengthOfBytesUsingEncoding(NSUTF16StringEncoding);
+            sum += _xVals[i] == nil ? 0 : count(_xVals[i]!);
         }
         
         _xValAverageLength = Float(sum) / Float(_xVals.count);

diff --git a/Charts/Classes/Renderers/ChartXAxisRenderer.swift b/Charts/Classes/Renderers/ChartXAxisRenderer.swift
@@ -278,7 +278,7 @@ public class ChartXAxisRenderer: ChartAxisRendererBase
             var label = l.label;
 
             // if drawing the limit-value label is enabled
-            if (label.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+            if (count(label) > 0)
             {
                 var labelLineHeight = l.valueFont.lineHeight;
 

diff --git a/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift
@@ -245,7 +245,7 @@ public class ChartXAxisRendererHorizontalBarChart: ChartXAxisRendererBarChart
             var label = l.label;
 
             // if drawing the limit-value label is enabled
-            if (label.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+            if (count(label) > 0)
             {
                 var labelLineHeight = l.valueFont.lineHeight;
 

diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -323,7 +323,7 @@ public class ChartYAxisRenderer: ChartAxisRendererBase
             var label = l.label;
 
             // if drawing the limit-value label is enabled
-            if (label.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+            if (count(label) > 0)
             {
                 var labelLineHeight = l.valueFont.lineHeight;
 

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift
@@ -250,7 +250,7 @@ public class ChartYAxisRendererHorizontalBarChart: ChartYAxisRenderer
             var label = l.label;
 
             // if drawing the limit-value label is enabled
-            if (label.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+            if (count(label) > 0)
             {
                 var labelLineHeight = l.valueFont.lineHeight;
 

diff --git a/Charts/Classes/Renderers/PieChartRenderer.swift b/Charts/Classes/Renderers/PieChartRenderer.swift
@@ -263,7 +263,7 @@ public class PieChartRenderer: ChartDataRendererBase
     /// draws the description text in the center of the pie chart makes most sense when center-hole is enabled
     private func drawCenterText(#context: CGContext)
     {
-        if (drawCenterTextEnabled && centerText != nil && centerText.lengthOfBytesUsingEncoding(NSUTF16StringEncoding) > 0)
+        if (drawCenterTextEnabled && centerText != nil && count(centerText) > 0)
         {
             var center = _chart.centerCircleBox;
             var innerRadius = drawHoleEnabled && holeTransparent ? _chart.radius * holeRadiusPercent : _chart.radius;