diff --git a/Chart/Chart.swift b/Chart/Chart.swift old mode 100644 new mode 100755 index 5d45bafeb..9840dc04c --- a/Chart/Chart.swift +++ b/Chart/Chart.swift @@ -14,7 +14,7 @@ protocol ChartDelegate { :param: chart The chart that has been touched. :param: indexes Each element of this array contains the index of the data that has been touched, one for each series. - If the series hasn't been touched, its index will be nil. + If the series hasn't been touched, its index will be nil. :param: x The value on the x-axis that has been touched. :param: left The distance from the left side of the chart. @@ -29,6 +29,14 @@ protocol ChartDelegate { */ func didFinishTouchingChart(chart: Chart) + + /** + Allows different animation's duration for each serie. + + :param: serieIndex Index of the serie + + */ + func animationDurationForSerieAtIndex(serieIndex: Int) -> CFTimeInterval } /** @@ -164,6 +172,16 @@ class Chart: UIControl { */ var areaAlphaComponent: CGFloat = 0.1 + /** + Whether the chart should animate or not, default is true. + */ + var animate: Bool = true + + /** + Set the time for the animations. It's overridden by the delegate's method + */ + var animationDuration: CFTimeInterval? + // MARK: Private variables private var highlightShapeLayer: CAShapeLayer! @@ -217,7 +235,7 @@ class Chart: UIControl { addSeries(s) } } - + /** Remove the series at the specified index. */ @@ -258,7 +276,7 @@ class Chart: UIControl { } private func drawChart() { - + drawingHeight = bounds.height - bottomInset - topInset drawingWidth = bounds.width @@ -444,6 +462,11 @@ class Chart: UIControl { lineLayer.lineWidth = lineWidth lineLayer.lineJoin = kCALineJoinBevel + // Animating lines + if animate { + animateDrawingLine(layer: lineLayer, index: seriesIndex) + } + self.layer.addSublayer(lineLayer) layerStore.append(lineLayer) @@ -476,6 +499,11 @@ class Chart: UIControl { } areaLayer.lineWidth = 0 + // Animate areas + if animate { + animateDrawingArea(layer: areaLayer, color: areaLayer.fillColor, index: seriesIndex) + } + self.layer.addSublayer(areaLayer) layerStore.append(areaLayer) @@ -539,7 +567,7 @@ class Chart: UIControl { for (i, value) in enumerate(scaled) { let x = CGFloat(value) - + // Add vertical grid for each label, except axes on the left and right @@ -548,7 +576,7 @@ class Chart: UIControl { CGContextAddLineToPoint(context, x, bounds.height) CGContextStrokePath(context) } - + if x == drawingWidth { // Do not add label at the most right position continue @@ -642,6 +670,38 @@ class Chart: UIControl { } + // MARK: - Animations + + func animateDrawingLine(#layer: CAShapeLayer, index: Int) { + let animation = CABasicAnimation(keyPath: "strokeEnd") + animation.fromValue = 0 + animation.toValue = 1 + animation.duration = delegate!.animationDurationForSerieAtIndex(index) ?? animationDuration ?? 1.2 + + animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + animation.fillMode = kCAFillModeBoth + animation.removedOnCompletion = false + + layer.strokeStart = 0 + layer.strokeEnd = 1 + layer.addAnimation(animation, forKey: animation.keyPath) + + } + + func animateDrawingArea(#layer: CAShapeLayer, color: CGColorRef, index: Int) { + let animation = CABasicAnimation(keyPath: "fillColor") + animation.fromValue = UIColor.clearColor().CGColor + animation.toValue = color + animation.duration = delegate!.animationDurationForSerieAtIndex(index) ?? animationDuration ?? 1.2 + + animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + animation.fillMode = kCAFillModeBoth + animation.removedOnCompletion = false + + layer.addAnimation(animation, forKey: animation.keyPath) + + } + // MARK: - Touch events private func drawHighlightLineFromLeftPosition(left: CGFloat) { @@ -788,6 +848,4 @@ class Chart: UIControl { private class func intersectionOnXAxisBetween(p1: ChartPoint, and p2: ChartPoint) -> ChartPoint { return (x: p1.x - (p2.x - p1.x) / (p2.y - p1.y) * p1.y, y: 0) } -} - - +} \ No newline at end of file diff --git a/Chart/ChartColors.swift b/Chart/ChartColors.swift old mode 100644 new mode 100755 diff --git a/Chart/ChartSeries.swift b/Chart/ChartSeries.swift old mode 100644 new mode 100755 index f3ba5de43..921947033 --- a/Chart/ChartSeries.swift +++ b/Chart/ChartSeries.swift @@ -36,5 +36,4 @@ class ChartSeries { init(data: Array<(x: Double, y: Double)>) { self.data = data.map ({ (Float($0.x), Float($0.y))}) } -} - +} \ No newline at end of file diff --git a/SwiftChart.xcodeproj/project.pbxproj b/SwiftChart.xcodeproj/project.pbxproj index 1cba6b68d..5102036ac 100644 --- a/SwiftChart.xcodeproj/project.pbxproj +++ b/SwiftChart.xcodeproj/project.pbxproj @@ -7,59 +7,58 @@ objects = { /* Begin PBXBuildFile section */ - 2404EEB11A0D5AE800BCB7D6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2404EEB01A0D5AE800BCB7D6 /* AppDelegate.swift */; }; - 2404EEB31A0D5AE800BCB7D6 /* BasicChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2404EEB21A0D5AE800BCB7D6 /* BasicChartViewController.swift */; }; - 2404EEB61A0D5AE800BCB7D6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2404EEB41A0D5AE800BCB7D6 /* Main.storyboard */; }; - 2404EEB81A0D5AE800BCB7D6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2404EEB71A0D5AE800BCB7D6 /* Images.xcassets */; }; - 2404EEBB1A0D5AE800BCB7D6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2404EEB91A0D5AE800BCB7D6 /* LaunchScreen.xib */; }; - 2404EEC71A0D5AE800BCB7D6 /* SwiftChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2404EEC61A0D5AE800BCB7D6 /* SwiftChartTests.swift */; }; - 24B787381A1927120027CCED /* StockChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B787371A1927120027CCED /* StockChartViewController.swift */; }; - 24BAF2721A18C90F006C921A /* AAPL.json in Resources */ = {isa = PBXBuildFile; fileRef = 24BAF2711A18C90F006C921A /* AAPL.json */; }; - 24BDECB51A176BD800D91AB7 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BDECB41A176BD800D91AB7 /* TableViewController.swift */; }; - 24D9EA1D1A1B33F000777E8D /* Chart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D9EA1A1A1B33F000777E8D /* Chart.swift */; }; - 24D9EA1E1A1B33F000777E8D /* ChartColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D9EA1B1A1B33F000777E8D /* ChartColors.swift */; }; - 24D9EA1F1A1B33F000777E8D /* ChartSeries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D9EA1C1A1B33F000777E8D /* ChartSeries.swift */; }; + 236D39C21B3C906000C21380 /* BasicChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39BF1B3C906000C21380 /* BasicChartViewController.swift */; }; + 236D39C31B3C906000C21380 /* StockChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39C01B3C906000C21380 /* StockChartViewController.swift */; }; + 236D39C41B3C906000C21380 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39C11B3C906000C21380 /* TableViewController.swift */; }; + 236D39CA1B3C959300C21380 /* Chart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39C71B3C959300C21380 /* Chart.swift */; }; + 236D39CB1B3C959300C21380 /* ChartColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39C81B3C959300C21380 /* ChartColors.swift */; }; + 236D39CC1B3C959300C21380 /* ChartSeries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236D39C91B3C959300C21380 /* ChartSeries.swift */; }; + 23B8DF341B3C0811005A881F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23B8DF331B3C0811005A881F /* AppDelegate.swift */; }; + 23B8DF3B1B3C0811005A881F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 23B8DF3A1B3C0811005A881F /* Images.xcassets */; }; + 23B8DF3E1B3C0811005A881F /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 23B8DF3C1B3C0811005A881F /* LaunchScreen.xib */; }; + 23B8DF4A1B3C0811005A881F /* SwiftChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23B8DF491B3C0811005A881F /* SwiftChartTests.swift */; }; + 23B8DF5A1B3C083B005A881F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 23B8DF591B3C083B005A881F /* Main.storyboard */; }; + 23B8DF5C1B3C0842005A881F /* AAPL.json in Resources */ = {isa = PBXBuildFile; fileRef = 23B8DF5B1B3C0842005A881F /* AAPL.json */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 2404EEC11A0D5AE800BCB7D6 /* PBXContainerItemProxy */ = { + 23B8DF441B3C0811005A881F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 2404EEA31A0D5AE800BCB7D6 /* Project object */; + containerPortal = 23B8DF261B3C0811005A881F /* Project object */; proxyType = 1; - remoteGlobalIDString = 2404EEAA1A0D5AE800BCB7D6; + remoteGlobalIDString = 23B8DF2D1B3C0811005A881F; remoteInfo = SwiftChart; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2404EEAB1A0D5AE800BCB7D6 /* SwiftChart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftChart.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 2404EEAF1A0D5AE800BCB7D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2404EEB01A0D5AE800BCB7D6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 2404EEB21A0D5AE800BCB7D6 /* BasicChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicChartViewController.swift; sourceTree = ""; }; - 2404EEB51A0D5AE800BCB7D6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 2404EEB71A0D5AE800BCB7D6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 2404EEBA1A0D5AE800BCB7D6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 2404EEC01A0D5AE800BCB7D6 /* SwiftChartTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftChartTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 2404EEC51A0D5AE800BCB7D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2404EEC61A0D5AE800BCB7D6 /* SwiftChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftChartTests.swift; sourceTree = ""; }; - 242A9E6C1A134DBE009DE9A8 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 24B787371A1927120027CCED /* StockChartViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StockChartViewController.swift; path = ../StockChartViewController.swift; sourceTree = ""; }; - 24BAF2711A18C90F006C921A /* AAPL.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AAPL.json; sourceTree = ""; }; - 24BDECB41A176BD800D91AB7 /* TableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = ""; }; - 24D9EA1A1A1B33F000777E8D /* Chart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Chart.swift; sourceTree = ""; }; - 24D9EA1B1A1B33F000777E8D /* ChartColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartColors.swift; sourceTree = ""; }; - 24D9EA1C1A1B33F000777E8D /* ChartSeries.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartSeries.swift; sourceTree = ""; }; + 236D39BF1B3C906000C21380 /* BasicChartViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BasicChartViewController.swift; path = ViewControllers/BasicChartViewController.swift; sourceTree = ""; }; + 236D39C01B3C906000C21380 /* StockChartViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StockChartViewController.swift; path = ViewControllers/StockChartViewController.swift; sourceTree = ""; }; + 236D39C11B3C906000C21380 /* TableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableViewController.swift; path = ViewControllers/TableViewController.swift; sourceTree = ""; }; + 236D39C71B3C959300C21380 /* Chart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Chart.swift; path = Chart/Chart.swift; sourceTree = SOURCE_ROOT; }; + 236D39C81B3C959300C21380 /* ChartColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChartColors.swift; path = Chart/ChartColors.swift; sourceTree = SOURCE_ROOT; }; + 236D39C91B3C959300C21380 /* ChartSeries.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChartSeries.swift; path = Chart/ChartSeries.swift; sourceTree = SOURCE_ROOT; }; + 23B8DF2E1B3C0811005A881F /* SwiftChart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftChart.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 23B8DF321B3C0811005A881F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 23B8DF331B3C0811005A881F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 23B8DF3A1B3C0811005A881F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 23B8DF3D1B3C0811005A881F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 23B8DF431B3C0811005A881F /* SwiftChartTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftChartTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 23B8DF481B3C0811005A881F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 23B8DF491B3C0811005A881F /* SwiftChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftChartTests.swift; sourceTree = ""; }; + 23B8DF591B3C083B005A881F /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + 23B8DF5B1B3C0842005A881F /* AAPL.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AAPL.json; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 2404EEA81A0D5AE800BCB7D6 /* Frameworks */ = { + 23B8DF2B1B3C0811005A881F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 2404EEBD1A0D5AE800BCB7D6 /* Frameworks */ = { + 23B8DF401B3C0811005A881F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -69,95 +68,94 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2404EEA21A0D5AE800BCB7D6 = { + 236D39C51B3C906300C21380 /* ViewControllers */ = { isa = PBXGroup; children = ( - 24D9EA191A1B33F000777E8D /* Chart */, - 242A9E6C1A134DBE009DE9A8 /* README.md */, - 2404EEAD1A0D5AE800BCB7D6 /* SwiftChart */, - 2404EEC31A0D5AE800BCB7D6 /* SwiftChartTests */, - 2404EEAC1A0D5AE800BCB7D6 /* Products */, + 236D39C11B3C906000C21380 /* TableViewController.swift */, + 236D39BF1B3C906000C21380 /* BasicChartViewController.swift */, + 236D39C01B3C906000C21380 /* StockChartViewController.swift */, ); + name = ViewControllers; sourceTree = ""; }; - 2404EEAC1A0D5AE800BCB7D6 /* Products */ = { + 236D39C61B3C906B00C21380 /* Chart */ = { isa = PBXGroup; children = ( - 2404EEAB1A0D5AE800BCB7D6 /* SwiftChart.app */, - 2404EEC01A0D5AE800BCB7D6 /* SwiftChartTests.xctest */, + 236D39C71B3C959300C21380 /* Chart.swift */, + 236D39C81B3C959300C21380 /* ChartColors.swift */, + 236D39C91B3C959300C21380 /* ChartSeries.swift */, ); - name = Products; + name = Chart; sourceTree = ""; }; - 2404EEAD1A0D5AE800BCB7D6 /* SwiftChart */ = { + 23B8DF251B3C0811005A881F = { isa = PBXGroup; children = ( - 2404EEB41A0D5AE800BCB7D6 /* Main.storyboard */, - 2404EEB01A0D5AE800BCB7D6 /* AppDelegate.swift */, - 24BDECB41A176BD800D91AB7 /* TableViewController.swift */, - 2404EEB21A0D5AE800BCB7D6 /* BasicChartViewController.swift */, - 24B787371A1927120027CCED /* StockChartViewController.swift */, - 24BAF2731A18C91E006C921A /* Resources */, - 2404EEAE1A0D5AE800BCB7D6 /* Supporting Files */, + 23B8DF301B3C0811005A881F /* SwiftChart */, + 23B8DF461B3C0811005A881F /* SwiftChartTests */, + 23B8DF2F1B3C0811005A881F /* Products */, ); - path = SwiftChart; sourceTree = ""; }; - 2404EEAE1A0D5AE800BCB7D6 /* Supporting Files */ = { + 23B8DF2F1B3C0811005A881F /* Products */ = { isa = PBXGroup; children = ( - 2404EEAF1A0D5AE800BCB7D6 /* Info.plist */, + 23B8DF2E1B3C0811005A881F /* SwiftChart.app */, + 23B8DF431B3C0811005A881F /* SwiftChartTests.xctest */, ); - name = "Supporting Files"; + name = Products; sourceTree = ""; }; - 2404EEC31A0D5AE800BCB7D6 /* SwiftChartTests */ = { + 23B8DF301B3C0811005A881F /* SwiftChart */ = { isa = PBXGroup; children = ( - 2404EEC61A0D5AE800BCB7D6 /* SwiftChartTests.swift */, - 2404EEC41A0D5AE800BCB7D6 /* Supporting Files */, + 23B8DF331B3C0811005A881F /* AppDelegate.swift */, + 23B8DF591B3C083B005A881F /* Main.storyboard */, + 236D39C51B3C906300C21380 /* ViewControllers */, + 236D39C61B3C906B00C21380 /* Chart */, + 23B8DF5B1B3C0842005A881F /* AAPL.json */, + 23B8DF3A1B3C0811005A881F /* Images.xcassets */, + 23B8DF3C1B3C0811005A881F /* LaunchScreen.xib */, + 23B8DF311B3C0811005A881F /* Supporting Files */, ); - path = SwiftChartTests; + path = SwiftChart; sourceTree = ""; }; - 2404EEC41A0D5AE800BCB7D6 /* Supporting Files */ = { + 23B8DF311B3C0811005A881F /* Supporting Files */ = { isa = PBXGroup; children = ( - 2404EEC51A0D5AE800BCB7D6 /* Info.plist */, + 23B8DF321B3C0811005A881F /* Info.plist */, ); name = "Supporting Files"; sourceTree = ""; }; - 24BAF2731A18C91E006C921A /* Resources */ = { + 23B8DF461B3C0811005A881F /* SwiftChartTests */ = { isa = PBXGroup; children = ( - 2404EEB71A0D5AE800BCB7D6 /* Images.xcassets */, - 24BAF2711A18C90F006C921A /* AAPL.json */, - 2404EEB91A0D5AE800BCB7D6 /* LaunchScreen.xib */, + 23B8DF491B3C0811005A881F /* SwiftChartTests.swift */, + 23B8DF471B3C0811005A881F /* Supporting Files */, ); - name = Resources; + path = SwiftChartTests; sourceTree = ""; }; - 24D9EA191A1B33F000777E8D /* Chart */ = { + 23B8DF471B3C0811005A881F /* Supporting Files */ = { isa = PBXGroup; children = ( - 24D9EA1A1A1B33F000777E8D /* Chart.swift */, - 24D9EA1B1A1B33F000777E8D /* ChartColors.swift */, - 24D9EA1C1A1B33F000777E8D /* ChartSeries.swift */, + 23B8DF481B3C0811005A881F /* Info.plist */, ); - path = Chart; + name = "Supporting Files"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 2404EEAA1A0D5AE800BCB7D6 /* SwiftChart */ = { + 23B8DF2D1B3C0811005A881F /* SwiftChart */ = { isa = PBXNativeTarget; - buildConfigurationList = 2404EECA1A0D5AE800BCB7D6 /* Build configuration list for PBXNativeTarget "SwiftChart" */; + buildConfigurationList = 23B8DF4D1B3C0811005A881F /* Build configuration list for PBXNativeTarget "SwiftChart" */; buildPhases = ( - 2404EEA71A0D5AE800BCB7D6 /* Sources */, - 2404EEA81A0D5AE800BCB7D6 /* Frameworks */, - 2404EEA91A0D5AE800BCB7D6 /* Resources */, + 23B8DF2A1B3C0811005A881F /* Sources */, + 23B8DF2B1B3C0811005A881F /* Frameworks */, + 23B8DF2C1B3C0811005A881F /* Resources */, ); buildRules = ( ); @@ -165,47 +163,46 @@ ); name = SwiftChart; productName = SwiftChart; - productReference = 2404EEAB1A0D5AE800BCB7D6 /* SwiftChart.app */; + productReference = 23B8DF2E1B3C0811005A881F /* SwiftChart.app */; productType = "com.apple.product-type.application"; }; - 2404EEBF1A0D5AE800BCB7D6 /* SwiftChartTests */ = { + 23B8DF421B3C0811005A881F /* SwiftChartTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 2404EECD1A0D5AE800BCB7D6 /* Build configuration list for PBXNativeTarget "SwiftChartTests" */; + buildConfigurationList = 23B8DF501B3C0811005A881F /* Build configuration list for PBXNativeTarget "SwiftChartTests" */; buildPhases = ( - 2404EEBC1A0D5AE800BCB7D6 /* Sources */, - 2404EEBD1A0D5AE800BCB7D6 /* Frameworks */, - 2404EEBE1A0D5AE800BCB7D6 /* Resources */, + 23B8DF3F1B3C0811005A881F /* Sources */, + 23B8DF401B3C0811005A881F /* Frameworks */, + 23B8DF411B3C0811005A881F /* Resources */, ); buildRules = ( ); dependencies = ( - 2404EEC21A0D5AE800BCB7D6 /* PBXTargetDependency */, + 23B8DF451B3C0811005A881F /* PBXTargetDependency */, ); name = SwiftChartTests; productName = SwiftChartTests; - productReference = 2404EEC01A0D5AE800BCB7D6 /* SwiftChartTests.xctest */; + productReference = 23B8DF431B3C0811005A881F /* SwiftChartTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 2404EEA31A0D5AE800BCB7D6 /* Project object */ = { + 23B8DF261B3C0811005A881F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; - ORGANIZATIONNAME = "Giampaolo Bellavite"; + LastUpgradeCheck = 0630; + ORGANIZATIONNAME = Manfredi; TargetAttributes = { - 2404EEAA1A0D5AE800BCB7D6 = { - CreatedOnToolsVersion = 6.1; - DevelopmentTeam = SHV5TZ9W43; + 23B8DF2D1B3C0811005A881F = { + CreatedOnToolsVersion = 6.3.2; }; - 2404EEBF1A0D5AE800BCB7D6 = { - CreatedOnToolsVersion = 6.1; - TestTargetID = 2404EEAA1A0D5AE800BCB7D6; + 23B8DF421B3C0811005A881F = { + CreatedOnToolsVersion = 6.3.2; + TestTargetID = 23B8DF2D1B3C0811005A881F; }; }; }; - buildConfigurationList = 2404EEA61A0D5AE800BCB7D6 /* Build configuration list for PBXProject "SwiftChart" */; + buildConfigurationList = 23B8DF291B3C0811005A881F /* Build configuration list for PBXProject "SwiftChart" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -213,30 +210,30 @@ en, Base, ); - mainGroup = 2404EEA21A0D5AE800BCB7D6; - productRefGroup = 2404EEAC1A0D5AE800BCB7D6 /* Products */; + mainGroup = 23B8DF251B3C0811005A881F; + productRefGroup = 23B8DF2F1B3C0811005A881F /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 2404EEAA1A0D5AE800BCB7D6 /* SwiftChart */, - 2404EEBF1A0D5AE800BCB7D6 /* SwiftChartTests */, + 23B8DF2D1B3C0811005A881F /* SwiftChart */, + 23B8DF421B3C0811005A881F /* SwiftChartTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 2404EEA91A0D5AE800BCB7D6 /* Resources */ = { + 23B8DF2C1B3C0811005A881F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2404EEB61A0D5AE800BCB7D6 /* Main.storyboard in Resources */, - 2404EEBB1A0D5AE800BCB7D6 /* LaunchScreen.xib in Resources */, - 2404EEB81A0D5AE800BCB7D6 /* Images.xcassets in Resources */, - 24BAF2721A18C90F006C921A /* AAPL.json in Resources */, + 23B8DF5A1B3C083B005A881F /* Main.storyboard in Resources */, + 23B8DF3E1B3C0811005A881F /* LaunchScreen.xib in Resources */, + 23B8DF3B1B3C0811005A881F /* Images.xcassets in Resources */, + 23B8DF5C1B3C0842005A881F /* AAPL.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 2404EEBE1A0D5AE800BCB7D6 /* Resources */ = { + 23B8DF411B3C0811005A881F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -246,51 +243,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 2404EEA71A0D5AE800BCB7D6 /* Sources */ = { + 23B8DF2A1B3C0811005A881F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 24D9EA1F1A1B33F000777E8D /* ChartSeries.swift in Sources */, - 24D9EA1D1A1B33F000777E8D /* Chart.swift in Sources */, - 24BDECB51A176BD800D91AB7 /* TableViewController.swift in Sources */, - 24D9EA1E1A1B33F000777E8D /* ChartColors.swift in Sources */, - 2404EEB31A0D5AE800BCB7D6 /* BasicChartViewController.swift in Sources */, - 24B787381A1927120027CCED /* StockChartViewController.swift in Sources */, - 2404EEB11A0D5AE800BCB7D6 /* AppDelegate.swift in Sources */, + 236D39CA1B3C959300C21380 /* Chart.swift in Sources */, + 236D39C41B3C906000C21380 /* TableViewController.swift in Sources */, + 23B8DF341B3C0811005A881F /* AppDelegate.swift in Sources */, + 236D39C21B3C906000C21380 /* BasicChartViewController.swift in Sources */, + 236D39C31B3C906000C21380 /* StockChartViewController.swift in Sources */, + 236D39CC1B3C959300C21380 /* ChartSeries.swift in Sources */, + 236D39CB1B3C959300C21380 /* ChartColors.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 2404EEBC1A0D5AE800BCB7D6 /* Sources */ = { + 23B8DF3F1B3C0811005A881F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2404EEC71A0D5AE800BCB7D6 /* SwiftChartTests.swift in Sources */, + 23B8DF4A1B3C0811005A881F /* SwiftChartTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 2404EEC21A0D5AE800BCB7D6 /* PBXTargetDependency */ = { + 23B8DF451B3C0811005A881F /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2404EEAA1A0D5AE800BCB7D6 /* SwiftChart */; - targetProxy = 2404EEC11A0D5AE800BCB7D6 /* PBXContainerItemProxy */; + target = 23B8DF2D1B3C0811005A881F /* SwiftChart */; + targetProxy = 23B8DF441B3C0811005A881F /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 2404EEB41A0D5AE800BCB7D6 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2404EEB51A0D5AE800BCB7D6 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 2404EEB91A0D5AE800BCB7D6 /* LaunchScreen.xib */ = { + 23B8DF3C1B3C0811005A881F /* LaunchScreen.xib */ = { isa = PBXVariantGroup; children = ( - 2404EEBA1A0D5AE800BCB7D6 /* Base */, + 23B8DF3D1B3C0811005A881F /* Base */, ); name = LaunchScreen.xib; sourceTree = ""; @@ -298,7 +287,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 2404EEC81A0D5AE800BCB7D6 /* Debug */ = { + 23B8DF4B1B3C0811005A881F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -317,9 +306,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -332,16 +323,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 2404EEC91A0D5AE800BCB7D6 /* Release */ = { + 23B8DF4C1B3C0811005A881F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -359,53 +349,50 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; }; - 2404EECB1A0D5AE800BCB7D6 /* Debug */ = { + 23B8DF4E1B3C0811005A881F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; INFOPLIST_FILE = SwiftChart/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; }; name = Debug; }; - 2404EECC1A0D5AE800BCB7D6 /* Release */ = { + 23B8DF4F1B3C0811005A881F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; INFOPLIST_FILE = SwiftChart/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; }; name = Release; }; - 2404EECE1A0D5AE800BCB7D6 /* Debug */ = { + 23B8DF511B3C0811005A881F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; @@ -424,7 +411,7 @@ }; name = Debug; }; - 2404EECF1A0D5AE800BCB7D6 /* Release */ = { + 23B8DF521B3C0811005A881F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; @@ -442,34 +429,34 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2404EEA61A0D5AE800BCB7D6 /* Build configuration list for PBXProject "SwiftChart" */ = { + 23B8DF291B3C0811005A881F /* Build configuration list for PBXProject "SwiftChart" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2404EEC81A0D5AE800BCB7D6 /* Debug */, - 2404EEC91A0D5AE800BCB7D6 /* Release */, + 23B8DF4B1B3C0811005A881F /* Debug */, + 23B8DF4C1B3C0811005A881F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2404EECA1A0D5AE800BCB7D6 /* Build configuration list for PBXNativeTarget "SwiftChart" */ = { + 23B8DF4D1B3C0811005A881F /* Build configuration list for PBXNativeTarget "SwiftChart" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2404EECB1A0D5AE800BCB7D6 /* Debug */, - 2404EECC1A0D5AE800BCB7D6 /* Release */, + 23B8DF4E1B3C0811005A881F /* Debug */, + 23B8DF4F1B3C0811005A881F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2404EECD1A0D5AE800BCB7D6 /* Build configuration list for PBXNativeTarget "SwiftChartTests" */ = { + 23B8DF501B3C0811005A881F /* Build configuration list for PBXNativeTarget "SwiftChartTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2404EECE1A0D5AE800BCB7D6 /* Debug */, - 2404EECF1A0D5AE800BCB7D6 /* Release */, + 23B8DF511B3C0811005A881F /* Debug */, + 23B8DF521B3C0811005A881F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 2404EEA31A0D5AE800BCB7D6 /* Project object */; + rootObject = 23B8DF261B3C0811005A881F /* Project object */; } diff --git a/SwiftChart.xcodeproj/project.xcworkspace/xcshareddata/SwiftChart.xccheckout b/SwiftChart.xcodeproj/project.xcworkspace/xcshareddata/SwiftChart.xccheckout index 3a405900a..f433c4122 100644 --- a/SwiftChart.xcodeproj/project.xcworkspace/xcshareddata/SwiftChart.xccheckout +++ b/SwiftChart.xcodeproj/project.xcworkspace/xcshareddata/SwiftChart.xccheckout @@ -5,23 +5,23 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - 2FB00766-EC55-478F-9044-C94FB09B963A + 387D2BAC-9022-4A60-AC68-E96F466EFCAB IDESourceControlProjectName - project + SwiftChart IDESourceControlProjectOriginsDictionary F97539AAC6A9217E19D39C74A6E4A0209901EE10 - github.com:gpbl/SwiftChart.git + https://github.com/norfred/SwiftChart.git IDESourceControlProjectPath - SwiftChart.xcodeproj/project.xcworkspace + SwiftChart.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary F97539AAC6A9217E19D39C74A6E4A0209901EE10 ../.. IDESourceControlProjectURL - github.com:gpbl/SwiftChart.git + https://github.com/norfred/SwiftChart.git IDESourceControlProjectVersion 111 IDESourceControlProjectWCCIdentifier diff --git a/SwiftChart/AAPL.json b/SwiftChart/AAPL.json old mode 100644 new mode 100755 diff --git a/SwiftChart/AppDelegate.swift b/SwiftChart/AppDelegate.swift index 0dd1e5ae0..5a8177813 100644 --- a/SwiftChart/AppDelegate.swift +++ b/SwiftChart/AppDelegate.swift @@ -3,7 +3,7 @@ // SwiftChart // // Created by Giampaolo Bellavite on 07/11/14. -// Copyright (c) 2014 Giampaolo Bellavite. All rights reserved. +// Copyright (c) 2015 Giampaolo Bellavite. All rights reserved. // import UIKit @@ -16,6 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { // Override point for customization after application launch. + UIApplication.sharedApplication().statusBarStyle = .LightContent return true } diff --git a/SwiftChart/Base.lproj/LaunchScreen.xib b/SwiftChart/Base.lproj/LaunchScreen.xib index 6420c7ac8..766f8c11b 100644 --- a/SwiftChart/Base.lproj/LaunchScreen.xib +++ b/SwiftChart/Base.lproj/LaunchScreen.xib @@ -1,7 +1,7 @@ - + - + @@ -11,6 +11,12 @@ + - + @@ -45,7 +46,7 @@ - + @@ -59,7 +60,7 @@ - + @@ -73,7 +74,7 @@ - + @@ -230,6 +231,11 @@ + + + + + diff --git a/SwiftChart/BasicChartViewController.swift b/SwiftChart/ViewControllers/BasicChartViewController.swift old mode 100644 new mode 100755 similarity index 89% rename from SwiftChart/BasicChartViewController.swift rename to SwiftChart/ViewControllers/BasicChartViewController.swift index 4173bae77..6754eec3f --- a/SwiftChart/BasicChartViewController.swift +++ b/SwiftChart/ViewControllers/BasicChartViewController.swift @@ -20,19 +20,20 @@ class BasicChartViewController: UIViewController, ChartDelegate { switch selectedChart { case 0: + title = "Basic Chart" + // Simple chart let chart2 = Chart(frame: CGRect(x: 0, y: 0, width: 100, height: 200)) - // Simple chart let series = ChartSeries([0, 6, 2, 8, 4, 7, 3, 10, 8]) series.color = ChartColors.greenColor() chart.addSeries(series) case 1: + title = "Multiple + Areas Chart" // Example with multiple series, the first two with area enabled - let series1 = ChartSeries([0, 6, 2, 8, 4, 7, 3, 10, 8]) series1.color = ChartColors.yellowColor() series1.area = true @@ -48,10 +49,9 @@ class BasicChartViewController: UIViewController, ChartDelegate { chart.addSeries([series1, series2, series3]) case 2: + title = "Below Zero Chart" // Chart with y-min, y-max and y-labels formatter - - let data: Array = [3, 6, -2, 6, 2, 4, -4, 3, -6, -1, -5] let series = ChartSeries(data) @@ -65,8 +65,10 @@ class BasicChartViewController: UIViewController, ChartDelegate { // Format y-axis, e.g. with units chart.yLabelsFormatter = { String(Int($1)) + "ºC" } - + case 3: + title = "Specific Values Chart" + // Create a new series specifying x and y values let data = [(x: 0, y: 0), (x: 0.5, y: 3.1), (x: 1.2, y: 2), (x: 2.1, y: -4.2), (x: 2.6, y: 1.1)] let series = ChartSeries(data: data) @@ -75,12 +77,9 @@ class BasicChartViewController: UIViewController, ChartDelegate { default: break; } - - } - // Chart delegate - + // MARK: - Chart delegate func didTouchChart(chart: Chart, indexes: Array, x: Float, left: CGFloat) { for (seriesIndex, dataIndex) in enumerate(indexes) { if let value = chart.valueForSeries(seriesIndex, atIndex: dataIndex) { @@ -93,6 +92,10 @@ class BasicChartViewController: UIViewController, ChartDelegate { } + func animationDurationForSerieAtIndex(index: Int) -> CFTimeInterval { + let values: Array = [1.0, 1.6, 2.2] + return values[index] + } override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) { @@ -100,7 +103,6 @@ class BasicChartViewController: UIViewController, ChartDelegate { // Redraw chart on rotation chart.setNeedsDisplay() - } -} +} \ No newline at end of file diff --git a/StockChartViewController.swift b/SwiftChart/ViewControllers/StockChartViewController.swift old mode 100644 new mode 100755 similarity index 95% rename from StockChartViewController.swift rename to SwiftChart/ViewControllers/StockChartViewController.swift index 9da62c0ad..c672bcf1c --- a/StockChartViewController.swift +++ b/SwiftChart/ViewControllers/StockChartViewController.swift @@ -22,7 +22,6 @@ class StockChartViewController: UIViewController, ChartDelegate { labelLeadingMarginInitialConstant = labelLeadingMarginConstraint.constant initializeChart() - } func initializeChart() { @@ -55,8 +54,8 @@ class StockChartViewController: UIViewController, ChartDelegate { let series = ChartSeries(serieData) series.area = true - // Configure chart layout + // Configure chart layout chart.lineWidth = 0.5 chart.labelFont = UIFont(name: "HelveticaNeue-Light", size: 12)! chart.xLabels = labels @@ -69,12 +68,10 @@ class StockChartViewController: UIViewController, ChartDelegate { chart.minY = minElement(serieData) - 5 chart.addSeries(series) - } - // Chart delegate + // MARK: - Chart delegate func didTouchChart(chart: Chart, indexes: Array, x: Float, left: CGFloat) { - if let value = chart.valueForSeries(0, atIndex: indexes[0]) { let numberFormatter = NSNumberFormatter() @@ -97,9 +94,7 @@ class StockChartViewController: UIViewController, ChartDelegate { } labelLeadingMarginConstraint.constant = constant - } - } func didFinishTouchingChart(chart: Chart) { @@ -107,7 +102,12 @@ class StockChartViewController: UIViewController, ChartDelegate { labelLeadingMarginConstraint.constant = labelLeadingMarginInitialConstant } + func animationDurationForSerieAtIndex(index: Int) -> CFTimeInterval { + let values: Array = [1.0, 1.6, 2.2] + return values[index] + } + // MARK: - Parsing func getStockValues() -> Array> { // Read the JSON file @@ -126,7 +126,6 @@ class StockChartViewController: UIViewController, ChartDelegate { } return values - } override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) { @@ -135,8 +134,6 @@ class StockChartViewController: UIViewController, ChartDelegate { // Redraw chart on rotation chart.setNeedsDisplay() - } - -} +} \ No newline at end of file diff --git a/SwiftChart/TableViewController.swift b/SwiftChart/ViewControllers/TableViewController.swift old mode 100644 new mode 100755 similarity index 93% rename from SwiftChart/TableViewController.swift rename to SwiftChart/ViewControllers/TableViewController.swift index dfa05f8a4..bae8c6df2 --- a/SwiftChart/TableViewController.swift +++ b/SwiftChart/ViewControllers/TableViewController.swift @@ -21,6 +21,7 @@ class TableViewController: UITableViewController, UITableViewDelegate { else { performSegueWithIdentifier("BasicChartSegue", sender: nil) } + tableView.deselectRowAtIndexPath(indexPath, animated: true) } override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { @@ -31,4 +32,4 @@ class TableViewController: UITableViewController, UITableViewDelegate { } } -} +} \ No newline at end of file diff --git a/SwiftChartTests/Info.plist b/SwiftChartTests/Info.plist index 72ba658db..afcec716b 100644 --- a/SwiftChartTests/Info.plist +++ b/SwiftChartTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.gbpl.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/SwiftChartTests/SwiftChartTests.swift b/SwiftChartTests/SwiftChartTests.swift index 548144959..4925359cf 100644 --- a/SwiftChartTests/SwiftChartTests.swift +++ b/SwiftChartTests/SwiftChartTests.swift @@ -8,7 +8,6 @@ import UIKit import XCTest -import SwiftChart class SwiftChartTests: XCTestCase { @@ -22,5 +21,16 @@ class SwiftChartTests: XCTestCase { super.tearDown() } + func testExample() { + // This is an example of a functional test case. + XCTAssert(true, "Pass") + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measureBlock() { + // Put the code you want to measure the time of here. + } + } }