From 4c9d3c8d35dd11f6ad25039591dd56fc9a33d405 Mon Sep 17 00:00:00 2001 From: liuxuan30 <liuxuan30@gmail.com> Date: Mon, 11 Apr 2016 10:47:23 +0800 Subject: [PATCH] add a switch whether to draw limit line's labels. default is true --- Charts/Classes/Components/ChartLimitLine.swift | 1 + Charts/Classes/Renderers/ChartXAxisRenderer.swift | 2 +- .../Renderers/ChartXAxisRendererHorizontalBarChart.swift | 2 +- Charts/Classes/Renderers/ChartYAxisRenderer.swift | 2 +- .../Renderers/ChartYAxisRendererHorizontalBarChart.swift | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Charts/Classes/Components/ChartLimitLine.swift b/Charts/Classes/Components/ChartLimitLine.swift index 5668aae316..d797e10aed 100644 --- a/Charts/Classes/Components/ChartLimitLine.swift +++ b/Charts/Classes/Components/ChartLimitLine.swift @@ -39,6 +39,7 @@ public class ChartLimitLine: ChartComponentBase public var valueTextColor = NSUIColor.blackColor() public var valueFont = NSUIFont.systemFontOfSize(13.0) public var label = "" + public var drawLabelEnabled = true public var labelPosition = LabelPosition.RightTop public override init() diff --git a/Charts/Classes/Renderers/ChartXAxisRenderer.swift b/Charts/Classes/Renderers/ChartXAxisRenderer.swift index 446b4a2343..2fd0147f1c 100644 --- 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 index 141a8fb5c7..83ad7a61ca 100644 --- 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 index c2287399bc..9a7a124e1a 100644 --- 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 index 9b65268655..e532c084c0 100644 --- 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