From b84df210311c7b5d7cab13b96b521479dba50d18 Mon Sep 17 00:00:00 2001 From: david ferreira Date: Tue, 22 Sep 2015 23:43:00 +0100 Subject: [PATCH 1/7] Repeated line removed from example --- ChartsDemo/Classes/Demos/LineChart1ViewController.m | 1 - 1 file changed, 1 deletion(-) diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m index cb9d67f2c1..b1ccf3797b 100644 --- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m +++ b/ChartsDemo/Classes/Demos/LineChart1ViewController.m @@ -90,7 +90,6 @@ - (void)viewDidLoad _chartView.rightAxis.enabled = NO; - [_chartView.viewPortHandler setMaximumScaleY: 2.f]; [_chartView.viewPortHandler setMaximumScaleY: 2.f]; BalloonMarker *marker = [[BalloonMarker alloc] initWithColor:[UIColor colorWithWhite:180/255. alpha:1.0] font:[UIFont systemFontOfSize:12.0] insets: UIEdgeInsetsMake(8.0, 8.0, 20.0, 8.0)]; From bbf72511d24e766b1712ec79ac1f041e5280d97c Mon Sep 17 00:00:00 2001 From: david ferreira Date: Wed, 23 Sep 2015 22:31:28 +0100 Subject: [PATCH 2/7] adding MaximumScaleX --- ChartsDemo/Classes/Demos/LineChart1ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m index b1ccf3797b..cabfe3b49b 100644 --- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m +++ b/ChartsDemo/Classes/Demos/LineChart1ViewController.m @@ -91,6 +91,7 @@ - (void)viewDidLoad _chartView.rightAxis.enabled = NO; [_chartView.viewPortHandler setMaximumScaleY: 2.f]; + [_chartView.viewPortHandler setMaximumScaleX: 2.f]; BalloonMarker *marker = [[BalloonMarker alloc] initWithColor:[UIColor colorWithWhite:180/255. alpha:1.0] font:[UIFont systemFontOfSize:12.0] insets: UIEdgeInsetsMake(8.0, 8.0, 20.0, 8.0)]; marker.minimumSize = CGSizeMake(80.f, 40.f); From 0576dd1c209f292242f95e863b879cd8fc59acbd Mon Sep 17 00:00:00 2001 From: david ferreira Date: Tue, 22 Sep 2015 23:43:00 +0100 Subject: [PATCH 3/7] Repeated line removed from example adding MaximumScaleX --- ChartsDemo/Classes/Demos/LineChart1ViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m index cb9d67f2c1..cabfe3b49b 100644 --- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m +++ b/ChartsDemo/Classes/Demos/LineChart1ViewController.m @@ -91,7 +91,7 @@ - (void)viewDidLoad _chartView.rightAxis.enabled = NO; [_chartView.viewPortHandler setMaximumScaleY: 2.f]; - [_chartView.viewPortHandler setMaximumScaleY: 2.f]; + [_chartView.viewPortHandler setMaximumScaleX: 2.f]; BalloonMarker *marker = [[BalloonMarker alloc] initWithColor:[UIColor colorWithWhite:180/255. alpha:1.0] font:[UIFont systemFontOfSize:12.0] insets: UIEdgeInsetsMake(8.0, 8.0, 20.0, 8.0)]; marker.minimumSize = CGSizeMake(80.f, 40.f); From 1721089904f90d3f3d550fe88fb6cdca5d9da9c4 Mon Sep 17 00:00:00 2001 From: Avishaan Date: Thu, 17 Sep 2015 00:20:39 -0400 Subject: [PATCH 4/7] be explicit on how to install 'Charts' when using CocoaPods since there is another Pod called 'ios-charts' --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 194eea7ea8..e6b050ecd4 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,10 @@ If you want to compile for iOS 7: 1. Drag the code itself (.swift files) to your project. As sadly, Swift currently does not support compiling Frameworks for iOS 7. 2. Make sure that the files are added to the Target membership. +## CocoaPods Install + +Add `Pod 'Charts'` to your Podfile. Adding `Pod 'ios-charts'` will not work!! + ## Help If you like what you see here, and want to support the work being done in this repository, you could: From 2c9d0a2877f60d00425f31a3e5f1c5b6b0b0cfcf Mon Sep 17 00:00:00 2001 From: david ferreira Date: Tue, 22 Sep 2015 23:43:00 +0100 Subject: [PATCH 5/7] Repeated line removed from example adding MaximumScaleX --- ChartsDemo/Classes/Demos/LineChart1ViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m index cb9d67f2c1..cabfe3b49b 100644 --- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m +++ b/ChartsDemo/Classes/Demos/LineChart1ViewController.m @@ -91,7 +91,7 @@ - (void)viewDidLoad _chartView.rightAxis.enabled = NO; [_chartView.viewPortHandler setMaximumScaleY: 2.f]; - [_chartView.viewPortHandler setMaximumScaleY: 2.f]; + [_chartView.viewPortHandler setMaximumScaleX: 2.f]; BalloonMarker *marker = [[BalloonMarker alloc] initWithColor:[UIColor colorWithWhite:180/255. alpha:1.0] font:[UIFont systemFontOfSize:12.0] insets: UIEdgeInsetsMake(8.0, 8.0, 20.0, 8.0)]; marker.minimumSize = CGSizeMake(80.f, 40.f); From f6565789b6d42fd9239c8811bf11b52f41e9a86a Mon Sep 17 00:00:00 2001 From: Daniel Cohen Gindi Date: Thu, 24 Sep 2015 03:12:39 +0300 Subject: [PATCH 6/7] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e6b050ecd4..be8a5358dd 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ If you want to compile for iOS 7: ## CocoaPods Install -Add `Pod 'Charts'` to your Podfile. Adding `Pod 'ios-charts'` will not work!! +Add `Pod 'Charts'` to your Podfile. "Charts" is the name of the library. +**Note:** `Pod 'ios-charts'` is not the correct library, and refers to a different project by someone else. ## Help From b01fa5def44c6017e043ffd7b4a2832ea71cf9bc Mon Sep 17 00:00:00 2001 From: david ferreira Date: Thu, 24 Sep 2015 22:45:12 +0100 Subject: [PATCH 7/7] Bug fix setMaximumScaleY should be setMaximumScaleX --- ChartsDemo/Classes/Demos/LineChart1ViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m index cb9d67f2c1..cabfe3b49b 100644 --- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m +++ b/ChartsDemo/Classes/Demos/LineChart1ViewController.m @@ -91,7 +91,7 @@ - (void)viewDidLoad _chartView.rightAxis.enabled = NO; [_chartView.viewPortHandler setMaximumScaleY: 2.f]; - [_chartView.viewPortHandler setMaximumScaleY: 2.f]; + [_chartView.viewPortHandler setMaximumScaleX: 2.f]; BalloonMarker *marker = [[BalloonMarker alloc] initWithColor:[UIColor colorWithWhite:180/255. alpha:1.0] font:[UIFont systemFontOfSize:12.0] insets: UIEdgeInsetsMake(8.0, 8.0, 20.0, 8.0)]; marker.minimumSize = CGSizeMake(80.f, 40.f);