add a switch whether to draw limit line's labels. default is true

ChartsOrg · Apr 11, 2016 · c946a0f · c946a0f
1 parent 9f19195
commit c946a0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Charts/Classes/Components/ChartLimitLine.swift b/Charts/Classes/Components/ChartLimitLine.swift
@@ -20,8 +20,8 @@ import CoreGraphics
 /// It allows the displaying of an additional line in the chart that marks a certain maximum / limit on the specified axis (x- or y-axis).
 public class ChartLimitLine: ChartComponentBase
 {
-    @objc(ChartLimitLabelPosition)
-    public enum LabelPosition: Int
+    @objc
+    public enum ChartLimitLabelPosition: Int
     {
         case LeftTop
         case LeftBottom
@@ -39,7 +39,8 @@ public class ChartLimitLine: ChartComponentBase
     public var valueTextColor = NSUIColor.blackColor()
     public var valueFont = NSUIFont.systemFontOfSize(13.0)
     public var label = ""
-    public var labelPosition = LabelPosition.RightTop
+    public var drawLabelEnabled = true
+    public var labelPosition = ChartLimitLabelPosition.RightTop
 
     public override init()
     {

diff --git a/Charts/Classes/Renderers/ChartXAxisRenderer.swift b/Charts/Classes/Renderers/ChartXAxisRenderer.swift
@@ -332,7 +332,7 @@ public class ChartXAxisRenderer: ChartAxisRendererBase
         let label = limitLine.label
 
         // if drawing the limit-value label is enabled
-        if (label.characters.count > 0)
+        if (limitLine.drawLabelEnabled && label.characters.count > 0)
         {
             let labelLineHeight = limitLine.valueFont.lineHeight
 

diff --git a/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartXAxisRendererHorizontalBarChart.swift
@@ -290,7 +290,7 @@ public class ChartXAxisRendererHorizontalBarChart: ChartXAxisRendererBarChart
             let label = l.label
 
             // if drawing the limit-value label is enabled
-            if (label.characters.count > 0)
+            if (l.drawLabelEnabled && label.characters.count > 0)
             {
                 let labelLineHeight = l.valueFont.lineHeight
 

diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -452,7 +452,7 @@ public class ChartYAxisRenderer: ChartAxisRendererBase
             let label = l.label
 
             // if drawing the limit-value label is enabled
-            if (label.characters.count > 0)
+            if (l.drawLabelEnabled && label.characters.count > 0)
             {
                 let labelLineHeight = l.valueFont.lineHeight
 

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift
@@ -291,7 +291,7 @@ public class ChartYAxisRendererHorizontalBarChart: ChartYAxisRenderer
             let label = l.label
 
             // if drawing the limit-value label is enabled
-            if (label.characters.count > 0)
+            if (l.drawLabelEnabled && label.characters.count > 0)
             {
                 let labelLineHeight = l.valueFont.lineHeight