Merge branch 'lineCap' of https://github.com/liuxuan30/ios-charts int…

…o liuxuan30-lineCap
yupuyang · Mar 17, 2016 · b072d6b · b072d6b
2 parents a76242e + 6e9f64b
commit b072d6b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/Charts/Classes/Data/Implementations/Standard/LineChartDataSet.swift b/Charts/Classes/Data/Implementations/Standard/LineChartDataSet.swift
@@ -64,6 +64,9 @@ public class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         }
     }
 
+    /// Line cap type, default is CGLineCap.Butt
+    public var lineCapType = CGLineCap.Butt
+
     /// If true, cubic lines are drawn instead of linear
     public var drawCubicEnabled = false
 

diff --git a/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift b/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
@@ -26,6 +26,9 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     /// **default**: 0.2
     var cubicIntensity: CGFloat { get set }
 
+    /// Line cap type, default is CGLineCap.Butt
+    var lineCapType: CGLineCap { get set }
+
     /// If true, cubic lines are drawn instead of linear
     var drawCubicEnabled: Bool { get set }
 

diff --git a/Charts/Classes/Renderers/LineChartRenderer.swift b/Charts/Classes/Renderers/LineChartRenderer.swift
@@ -268,6 +268,8 @@ public class LineChartRenderer: LineRadarChartRenderer
         let maxx = min(max(minx + 2, dataSet.entryIndex(entry: entryTo) + 1), entryCount)
 
         CGContextSaveGState(context)
+
+        CGContextSetLineCap(context, dataSet.lineCapType)
 
         // more than 1 color
         if (dataSet.colors.count > 1)

diff --git a/ChartsRealm/Classes/Data/RealmLineDataSet.swift b/ChartsRealm/Classes/Data/RealmLineDataSet.swift
@@ -54,6 +54,9 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet
         }
     }
 
+    /// Line cap type, default is CGLineCap.Butt
+    public var lineCapType = CGLineCap.Butt
+
     /// If true, cubic lines are drawn instead of linear
     public var drawCubicEnabled = false