Skip to content

Commit

Permalink
Merge branch 'master' into 4.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	Charts.xcodeproj/project.pbxproj
#	Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift
#	Source/Charts/Renderers/BarChartRenderer.swift
#	Source/Charts/Renderers/BubbleChartRenderer.swift
#	Source/Charts/Renderers/CandleStickChartRenderer.swift
#	Source/Charts/Renderers/ChartDataRendererBase.swift
#	Source/Charts/Renderers/LineChartRenderer.swift
#	Source/Charts/Renderers/PieChartRenderer.swift
#	Source/Charts/Renderers/RadarChartRenderer.swift
#	Source/Charts/Renderers/ScatterChartRenderer.swift
  • Loading branch information
pmairoldi committed Jul 14, 2018
2 parents ea3cedd + 61eb6e6 commit 73183d5
Show file tree
Hide file tree
Showing 34 changed files with 1,093 additions and 199 deletions.
14 changes: 9 additions & 5 deletions Charts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823F7DB281C6C6F069A69605 /* CrossShapeRenderer.swift */; };
0577C2B38BCE4C871F262714 /* AnimatedZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2EA58CB336967198D30D20 /* AnimatedZoomViewJob.swift */; };
064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064989451F5C99C7006E8BB3 /* Snapshot.swift */; };
06AB297F20FA726600BAD505 /* Highlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06AB297E20FA726500BAD505 /* Highlighter.swift */; };
0A772AEC08246FEC480673E5 /* PieRadarChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A6C9631C69B2D772BBD9232 /* PieRadarChartViewBase.swift */; };
0C52C70C6E6EA09BD7426386 /* RadarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB57D6FA41029B08F26D7B /* RadarChartData.swift */; };
0CAF514A280FF6A14E2A1A23 /* CombinedChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11EF1FE22549E885C8F40738 /* CombinedChartView.swift */; };
0D8A89398F9BD5DCC8D7F976 /* CandleChartDataSetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18BFB0A14A5C47A302A597D9 /* CandleChartDataSetProtocol.swift */; };
11F68AA2EBF822D7208EE002 /* YAxisRendererRadarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5A16F4A382813C4FE8BDF9 /* YAxisRendererRadarChart.swift */; };
1311BEC21E9CC264E971EFAF /* LineRadarChartDataSetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E6A99D82E6AE3804D5A39 /* LineRadarChartDataSetProtocol.swift */; };
146EE16342C2BADC92E45BF2 /* LineScatterCandleRadarChartDataSetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9249AD9AEC8C85772365A128 /* LineScatterCandleRadarChartDataSetProtocol.swift */; };
135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135F11CD20425AF600D655A3 /* PieChartTests.swift */; };
146EE16342C2BADC92E45BF2 /* LineScatterCandleRadarChartDataSetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9249AD9AEC8C85772365A128 /* LineScatterCandleRadarChartDataSetProtocol.swift */; };
17E994DA88777AA1D8CCFC58 /* BarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */; };
203A39685CC96FC625F616E4 /* Highlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998F2BFE318471AFC05B50AC /* Highlighter.swift */; };
219192CA6B4895319AB49DCA /* BarLineScatterCandleBubbleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1C588E9DF6FFD56D7ADF8E /* BarLineScatterCandleBubbleRenderer.swift */; };
2243BBFD1FF156EC00B49D0B /* EquatableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2243BBFB1FF156D000B49D0B /* EquatableTests.swift */; };
224EFF991FBAAC4700CF9B3B /* (null) in Sources */ = {isa = PBXBuildFile; };
Expand Down Expand Up @@ -99,6 +99,7 @@
9400725714D0DA707DDECD2E /* ViewPortJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA7BDB22C97F39A4B33E38A7 /* ViewPortJob.swift */; };
95B6D6F35684292A62DBEA74 /* LineChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A75AA73C5AA381DA517959 /* LineChartDataSet.swift */; };
967EE2EDDE3337C5C4337C59 /* IndexAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10DD0A02E3CF611BD11EBA9B /* IndexAxisValueFormatter.swift */; };
97AD2D4620AF917100F9C24A /* Platform+Accessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */; };
97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EF9709CF635BEE70D1ABC5 /* DataApproximator.swift */; };
98E2EEF45E8933E4AD182D58 /* ChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EFAD7920F76360ADB3B5F5 /* ChartViewBase.swift */; };
9A26C8DB1F87B01700367599 /* DataApproximator+N.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A26C8DA1F87B01700367599 /* DataApproximator+N.swift */; };
Expand Down Expand Up @@ -171,6 +172,7 @@
04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieRadarHighlighter.swift; path = Source/Charts/Highlight/PieRadarHighlighter.swift; sourceTree = "<group>"; };
0619A877C69A95ECCC440A44 /* LineChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartView.swift; path = Source/Charts/Charts/LineChartView.swift; sourceTree = "<group>"; };
064989451F5C99C7006E8BB3 /* Snapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Snapshot.swift; path = Tests/Charts/Snapshot.swift; sourceTree = "<group>"; };
06AB297E20FA726500BAD505 /* Highlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Highlighter.swift; path = Source/Charts/Highlight/Highlighter.swift; sourceTree = "<group>"; };
0BD9DF16AF59680A3BB49452 /* AxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AxisValueFormatter.swift; path = Source/Charts/Formatters/AxisValueFormatter.swift; sourceTree = "<group>"; };
0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartRenderer.swift; path = Source/Charts/Renderers/LineChartRenderer.swift; sourceTree = "<group>"; };
0DDE409E9ECF54D2C146A6F0 /* CombinedChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartData.swift; path = Source/Charts/Data/Implementations/Standard/CombinedChartData.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -258,7 +260,7 @@
923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineScatterCandleRadarRenderer.swift; path = Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift; sourceTree = "<group>"; };
9249AD9AEC8C85772365A128 /* LineScatterCandleRadarChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineScatterCandleRadarChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/LineScatterCandleRadarChartDataSetProtocol.swift; sourceTree = "<group>"; };
93EF9709CF635BEE70D1ABC5 /* DataApproximator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DataApproximator.swift; path = Source/Charts/Filters/DataApproximator.swift; sourceTree = "<group>"; };
998F2BFE318471AFC05B50AC /* Highlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Highlighter.swift; path = Source/Charts/Highlight/Highlighter.swift; sourceTree = "<group>"; };
97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Platform+Accessibility.swift"; path = "Source/Charts/Utils/Platform+Accessibility.swift"; sourceTree = "<group>"; };
9A26C8DA1F87B01700367599 /* DataApproximator+N.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "DataApproximator+N.swift"; path = "Source/Charts/Filters/DataApproximator+N.swift"; sourceTree = "<group>"; };
9D7184C8A5A60A3522AB9B05 /* BarChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataProvider.swift; path = Source/Charts/Interfaces/BarChartDataProvider.swift; sourceTree = "<group>"; };
9DCD13D558BA177D5952AD66 /* PieChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartView.swift; path = Source/Charts/Charts/PieChartView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -482,12 +484,12 @@
42824E1F334B0C484AF4C594 /* Highlight */ = {
isa = PBXGroup;
children = (
06AB297E20FA726500BAD505 /* Highlighter.swift */,
543729805D897CC03E5F78D3 /* BarHighlighter.swift */,
5983826927D825EF5F855C28 /* ChartHighlighter.swift */,
2465CB73738EBAFB46C57288 /* CombinedHighlighter.swift */,
3D64616883374310C505EC39 /* Highlight.swift */,
33BE9A97FFA41D3D85CAFFC7 /* HorizontalBarHighlighter.swift */,
998F2BFE318471AFC05B50AC /* Highlighter.swift */,
7036F11832C017E26AC750A4 /* PieHighlighter.swift */,
04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */,
F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */,
Expand Down Expand Up @@ -627,6 +629,7 @@
3FDA09EF973925A110506799 /* ChartUtils.swift */,
5A4CFFFB65819121595F06F1 /* Fill.swift */,
3ED23C354AFE81818D78E645 /* Platform.swift */,
97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */,
FF475B9593B9898853814340 /* Transformer.swift */,
324C9127B53A8D39C8B49277 /* TransformerHorizontalBarChart.swift */,
72EAEBB7CF73E33565FC2896 /* ViewPortHandler.swift */,
Expand Down Expand Up @@ -916,7 +919,6 @@
64FA1EDB4DC1F65727D52D10 /* CombinedHighlighter.swift in Sources */,
758EB1C75063ED3373542F3B /* Highlight.swift in Sources */,
4E98788ABEF6496C23F3E6C6 /* HorizontalBarHighlighter.swift in Sources */,
203A39685CC96FC625F616E4 /* Highlighter.swift in Sources */,
73EDF662AD989E930D365B72 /* PieHighlighter.swift in Sources */,
3097296AC7FFA994FE4AD312 /* PieRadarHighlighter.swift in Sources */,
C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */,
Expand All @@ -929,6 +931,7 @@
65EA404AE098EBCE8D5DE04B /* CombinedChartDataProvider.swift in Sources */,
2BA03CEC36BADCF682F1328B /* LineChartDataProvider.swift in Sources */,
0511E43EF3FD2CDE7F7F15DB /* ScatterChartDataProvider.swift in Sources */,
06AB297F20FA726600BAD505 /* Highlighter.swift in Sources */,
7EE6EFE70CF4D8B09CAFCD01 /* AnimatedMoveViewJob.swift in Sources */,
CC7F8198A13249B5DEBBF25E /* AnimatedViewPortJob.swift in Sources */,
0577C2B38BCE4C871F262714 /* AnimatedZoomViewJob.swift in Sources */,
Expand All @@ -948,6 +951,7 @@
24151B0729D77251A8494D70 /* LineRadarRenderer.swift in Sources */,
B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */,
795E100895C24049509F1EDE /* PieChartRenderer.swift in Sources */,
97AD2D4620AF917100F9C24A /* Platform+Accessibility.swift in Sources */,
69EA073EDF75D49ABE1715D6 /* RadarChartRenderer.swift in Sources */,
CEF68F42A5390A73113F3663 /* Renderer.swift in Sources */,
796D3E63A37A95FD9D1AB9A1 /* ChevronDownShapeRenderer.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

self.title = @"Half Pie Bar Chart";
self.title = @"Half Pie Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

self.title = @"Pie Bar Chart";
self.title = @"Pie Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

self.title = @"Pie Bar Chart";
self.title = @"Pie Poly Line Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

self.title = @"Bar Chart";
self.title = @"Positive/Negative Bar Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Values"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ - (void)viewDidLoad

self.activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ];

self.title = @"Radar Bar Chart";
self.title = @"Radar Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Values"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];

self.title = @"Scatter Bar Chart";
self.title = @"Scatter Chart";

self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Values"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class AnotherBarChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Another Bar Chart"

self.options = [.toggleValues,
.toggleHighlight,
.animateX,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class CandleStickChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Bubble Chart"
self.title = "Candle Stick Chart"
self.options = [.toggleValues,
.toggleIcons,
.toggleHighlight,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class HalfPieChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Half Pie Bar Chart"
self.title = "Half Pie Chart"

self.options = [.toggleValues,
.toggleXValues,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class LineChartTimeViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Line Chart 2"
self.title = "Time Line Chart"
self.options = [.toggleValues,
.toggleFilled,
.toggleCircles,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class PiePolylineChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Pie Bar Chart"
self.title = "Pie Poly Line Chart"

self.options = [.toggleValues,
.toggleXValues,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class PositiveNegativeBarChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Bar Chart"
self.title = "Positive/Negative Bar Chart"
self.options = [.toggleValues,
.toggleHighlight,
.animateX,
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RadarChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Radar Bar Chart"
self.title = "Radar Chart"
self.options = [.toggleValues,
.toggleHighlight,
.toggleHighlightCircle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ScatterChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Scatter Bar Chart"
self.title = "Scatter Chart"
self.options = [.toggleValues,
.toggleHighlight,
.animateX,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SinusBarChartViewController: DemoBaseViewController {
super.viewDidLoad()

// Do any additional setup after loading the view.
self.title = "Line Chart 2"
self.title = "Sinus Bar Chart"
self.options = [.toggleValues,
.toggleHighlight,
.animateX,
Expand Down
6 changes: 6 additions & 0 deletions Source/Charts/Charts/ChartViewBase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,12 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
attributes: attrs)
}

// MARK: - Accessibility

open override func accessibilityChildren() -> [Any]? {
return renderer?.accessibleChartElements
}

// MARK: - Highlighting

/// Set this to false to prevent values from being highlighted by tap gesture.
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Components/Description.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ open class Description: ComponentBase
}

/// The text to be shown as the description.
@objc open var text: String? = "Description Label"
@objc open var text: String?

/// Custom position for the description text in pixels on the screen.
open var position: CGPoint? = nil
Expand Down
16 changes: 16 additions & 0 deletions Source/Charts/Data/Implementations/Standard/ChartData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ open class ChartData: NSObject, ExpressibleByArrayLiteral
var rightAxisMax = -Double.greatestFiniteMagnitude
var rightAxisMin = Double.greatestFiniteMagnitude

// MARK: - Accessibility

/// When the data entry labels are generated identifiers, set this property to prepend a string before each identifier
///
/// For example, if a label is "#3", settings this property to "Item" allows it to be spoken as "Item #3"
@objc open var accessibilityEntryLabelPrefix: String?

/// When the data entry value requires a unit, use this property to append the string representation of the unit to the value
///
/// For example, if a value is "44.1", setting this property to "m" allows it to be spoken as "44.1 m"
@objc open var accessibilityEntryLabelSuffix: String?

/// If the data entry value is a count, set this to true to allow plurals and other grammatical changes
/// **default**: false
@objc open var accessibilityEntryLabelSuffixIsCount: Bool = false

var _dataSets = [Element]()

public override required init()
Expand Down
38 changes: 19 additions & 19 deletions Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ open class PieChartDataSet: ChartDataSet, PieChartDataSetProtocol
case insideSlice
case outsideSlice
}

private func initialize()
{
self.valueTextColor = NSUIColor.white
self.valueFont = NSUIFont.systemFont(ofSize: 13.0)
}

public required init()
{
super.init()
Expand All @@ -38,16 +38,16 @@ open class PieChartDataSet: ChartDataSet, PieChartDataSetProtocol
super.init(values: values, label: label)
initialize()
}

internal override func calcMinMax(entry e: ChartDataEntry)
{
calcMinMaxY(entry: e)
}

// MARK: - Styling functions and accessors

private var _sliceSpace = CGFloat(0.0)

/// the space in pixels between the pie-slices
/// **default**: 0
/// **maximum**: 20
Expand All @@ -69,42 +69,42 @@ open class PieChartDataSet: ChartDataSet, PieChartDataSetProtocol

/// When enabled, slice spacing will be 0.0 when the smallest value is going to be smaller than the slice spacing itself.
open var automaticallyDisableSliceSpacing: Bool = false

/// indicates the selection distance of a pie slice
open var selectionShift = CGFloat(18.0)

open var xValuePosition: ValuePosition = .insideSlice
open var yValuePosition: ValuePosition = .insideSlice

/// When valuePosition is OutsideSlice, indicates line color
open var valueLineColor: NSUIColor? = NSUIColor.black

/// When valuePosition is OutsideSlice, indicates line width
open var valueLineWidth: CGFloat = 1.0

/// When valuePosition is OutsideSlice, indicates offset as percentage out of the slice size
open var valueLinePart1OffsetPercentage: CGFloat = 0.75

/// When valuePosition is OutsideSlice, indicates length of first half of the line
open var valueLinePart1Length: CGFloat = 0.3

/// When valuePosition is OutsideSlice, indicates length of second half of the line
open var valueLinePart2Length: CGFloat = 0.4

/// When valuePosition is OutsideSlice, this allows variable line length
open var valueLineVariableLength: Bool = true

/// the font for the slice-text labels
open var entryLabelFont: NSUIFont? = nil

/// the color for the slice-text labels
open var entryLabelColor: NSUIColor? = nil

/// the color for the highlighted sector
open var highlightColor: NSUIColor? = nil

// MARK: - NSCopying

open override func copyWithZone(_ zone: NSZone?) -> AnyObject
{
let copy = super.copyWithZone(zone) as! PieChartDataSet
Expand Down
Loading

0 comments on commit 73183d5

Please sign in to comment.