新增折线图、柱状图实时刷新时动态调整纵坐标

sichenhz · sichenhz · commit 75664391e4ef · 2016-02-19T01:59:49.000+08:00
1.新增折线图、柱状图刷新数据时动态调整纵坐标
2.新增饼状图刷新数据的方法
diff --git a/SCChart.xcodeproj/project.pbxproj b/SCChart.xcodeproj/project.pbxproj
@@ -177,26 +177,26 @@
 		250383E41AB2CAA50034BB22 /* SCChart */ = {
 			isa = PBXGroup;
 			children = (
-				250383E51AB2CAA50034BB22 /* SCBar.h */,
-				250383E61AB2CAA50034BB22 /* SCBar.m */,
-				250383E71AB2CAA50034BB22 /* SCBarChart.h */,
-				250383E81AB2CAA50034BB22 /* SCBarChart.m */,
 				250383E91AB2CAA50034BB22 /* SCChart.h */,
 				250383EA1AB2CAA50034BB22 /* SCChart.m */,
+				250383EF1AB2CAA50034BB22 /* SCLineChart.h */,
+				250383F01AB2CAA50034BB22 /* SCLineChart.m */,
+				250383E71AB2CAA50034BB22 /* SCBarChart.h */,
+				250383E81AB2CAA50034BB22 /* SCBarChart.m */,
+				25FA1F3A1AC15F4300F4C43F /* SCCircleChart.h */,
+				25FA1F3B1AC15F4300F4C43F /* SCCircleChart.m */,
+				25FA1F4D1AC1708800F4C43F /* SCPieChart.h */,
+				25FA1F4E1AC1708800F4C43F /* SCPieChart.m */,
+				250383E51AB2CAA50034BB22 /* SCBar.h */,
+				250383E61AB2CAA50034BB22 /* SCBar.m */,
 				250383EB1AB2CAA50034BB22 /* SCChartLabel.h */,
 				250383EC1AB2CAA50034BB22 /* SCChartLabel.m */,
 				250383ED1AB2CAA50034BB22 /* SCColor.h */,
 				250383EE1AB2CAA50034BB22 /* SCColor.m */,
-				250383EF1AB2CAA50034BB22 /* SCLineChart.h */,
-				250383F01AB2CAA50034BB22 /* SCLineChart.m */,
 				250383F11AB2CAA50034BB22 /* SCTool.h */,
 				250383F21AB2CAA50034BB22 /* SCTool.m */,
-				25FA1F3A1AC15F4300F4C43F /* SCCircleChart.h */,
-				25FA1F3B1AC15F4300F4C43F /* SCCircleChart.m */,
 				25FA1F3D1AC15F4B00F4C43F /* UICountingLabel.h */,
 				25FA1F3E1AC15F4B00F4C43F /* UICountingLabel.m */,
-				25FA1F4D1AC1708800F4C43F /* SCPieChart.h */,
-				25FA1F4E1AC1708800F4C43F /* SCPieChart.m */,
 				25FA1F4F1AC1708800F4C43F /* SCPieChartDataItem.h */,
 				25FA1F501AC1708800F4C43F /* SCPieChartDataItem.m */,
 				25FA1F561AC1718200F4C43F /* SCGenericChart.h */,
diff --git a/SCChart/SCBarCell.m b/SCChart/SCBarCell.m
@@ -18,13 +18,30 @@ @interface SCBarCell ()<SCChartDataSource>
 
 @implementation SCBarCell
 
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [btn setTitle:@"点击刷新数据" forState:UIControlStateNormal];
+        btn.titleLabel.font = [UIFont systemFontOfSize:12.0];;
+        [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        btn.frame = CGRectMake(0, 0, SCREEN_WIDTH, 27);
+        [btn addTarget:self action:@selector(btnPressed:) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:btn];
+    }
+    return self;
+}
+
+- (void)btnPressed:(id)sender {
+    [chartView strokeChart];
+}
+
 - (void)configUI:(NSIndexPath *)indexPath {
     if (chartView) {
         [chartView removeFromSuperview];
         chartView = nil;
     }
     path = indexPath;
-    chartView = [[SCChart alloc] initwithSCChartDataFrame:CGRectMake(10, 10, [UIScreen mainScreen].bounds.size.width - 20, 150)
+    chartView = [[SCChart alloc] initwithSCChartDataFrame:CGRectMake(10, (self.frame.size.height-150)/2, [UIScreen mainScreen].bounds.size.width - 20, 150)
                                                withSource:self
                                                 withStyle:SCChartBarStyle];
     [chartView showInView:self.contentView];
@@ -50,14 +67,29 @@ - (NSArray *)SCChart_yValueArray:(SCChart *)chart {
     switch (path.row) {
         case 0:
         {
-            NSArray *ary = @[@"0.2",@"0.14",@"0.12",@"0.44",@"0.4",@"0.13",@"0.21"];
+            NSMutableArray *ary = [NSMutableArray array];
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(100);
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary addObject:str];
+            }
             return @[ary];
             break;
         }
         case 1:
         {
-            NSArray *ary = @[@"22",@"44",@"15",@"22",@"44",@"15",@"22"];
-            NSArray *ary2 = @[@"52",@"13",@"43",@"12",@"4",@"65",@"12"];
+            NSMutableArray *ary = [NSMutableArray array];
+            NSMutableArray *ary2 = [NSMutableArray array];
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(1000) / 100;
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary addObject:str];
+            }
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(1000) / 100;
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary2 addObject:str];
+            }
             return @[ary,ary2];
             break;
         }
diff --git a/SCChart/SCChart/SCChart.m b/SCChart/SCChart/SCChart.m
@@ -40,6 +40,10 @@ - (id)initWithFrame:(CGRect)frame
 
 -(void)setUpChart{
 	if (self.chartStyle == SCChartLineStyle) {
+        
+        [self.lineChart removeFromSuperview];
+        self.lineChart = nil;
+
         if(!_lineChart){
             _lineChart = [[SCLineChart alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
             [self addSubview:_lineChart];
@@ -92,6 +96,10 @@ -(void)setUpChart{
 
 	}else if (self.chartStyle == SCChartBarStyle)
 	{
+        
+        [self.barChart removeFromSuperview];
+        self.barChart = nil;
+
         if (!_barChart) {
             _barChart = [[SCBarChart alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
             [self addSubview:_barChart];
diff --git a/SCChart/SCChart/SCPieChart.h b/SCChart/SCChart/SCPieChart.h
@@ -40,6 +40,8 @@
 
 @property (nonatomic, weak) id<SCChartDelegate> delegate;
 
+- (void)updateChartByNumbers:(NSArray *)numbers;
+
 - (void)strokeChart;
 
 @end
diff --git a/SCChart/SCChart/SCPieChart.m b/SCChart/SCChart/SCPieChart.m
@@ -432,4 +432,16 @@ - (UIImageView*)drawInflexion:(CGFloat)size center:(CGPoint)center andColor:(UIC
     [squareImageView setFrame:CGRectMake(originX, originY, size, size)];
     return squareImageView;
 }
+
+- (void)updateChartByNumbers:(NSArray *)numbers {
+    for (SCPieChartDataItem *item in self.items) {
+        NSInteger index = [self.items indexOfObject:item];
+        if (index >= numbers.count) {
+            break;
+        }
+        item.value = [numbers[index] integerValue];
+    }
+    [self strokeChart];
+}
+
 @end
diff --git a/SCChart/SCChartCell.m b/SCChart/SCChartCell.m
@@ -18,13 +18,30 @@ @interface SCChartCell ()<SCChartDataSource>
 
 @implementation SCChartCell
 
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [btn setTitle:@"点击刷新数据" forState:UIControlStateNormal];
+        btn.titleLabel.font = [UIFont systemFontOfSize:12.0];;
+        [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        btn.frame = CGRectMake(0, 0, SCREEN_WIDTH, 27);
+        [btn addTarget:self action:@selector(btnPressed:) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:btn];
+    }
+    return self;
+}
+
+- (void)btnPressed:(id)sender {
+    [chartView strokeChart];
+}
+
 - (void)configUI:(NSIndexPath *)indexPath {
     if (chartView) {
         [chartView removeFromSuperview];
         chartView = nil;
     }
     path = indexPath;
-    chartView = [[SCChart alloc] initwithSCChartDataFrame:CGRectMake(10, 10, [UIScreen mainScreen].bounds.size.width - 20, 150)
+    chartView = [[SCChart alloc] initwithSCChartDataFrame:CGRectMake(10, (self.frame.size.height-150)/2, [UIScreen mainScreen].bounds.size.width - 20, 150)
                                                withSource:self
                                                 withStyle:SCChartLineStyle];
     [chartView showInView:self.contentView];
@@ -50,22 +67,52 @@ - (NSArray *)SCChart_yValueArray:(SCChart *)chart {
     switch (path.row) {
         case 0:
         {
-            NSArray *ary = @[@"0.2",@"0.14",@"0.12",@"0.44",@"0.4",@"0.13",@"0.21"];
+            NSMutableArray *ary = [NSMutableArray array];
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(100);
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary addObject:str];
+            }
             return @[ary];
             break;
         }
         case 1:
         {
-            NSArray *ary = @[@"22",@"44",@"15",@"22",@"44",@"15",@"22"];
-            NSArray *ary2 = @[@"16",@"63",@"64",@"23",@"133",@"64",@"15"];
+            NSMutableArray *ary = [NSMutableArray array];
+            NSMutableArray *ary2 = [NSMutableArray array];
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(1000) / 100;
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary addObject:str];
+            }
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(1000) / 100;
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary2 addObject:str];
+            }
             return @[ary,ary2];
             break;
         }
         case 2:
         {
-            NSArray *ary = @[@"0.2",@"0.14",@"0.12",@"0.44",@"0.4",@"0.13",@"0.21"];
-            NSArray *ary2 = @[@"0.16",@"0.63",@"0.64",@"0.23",@"0.133",@"0.64",@"0.15"];
-            NSArray *ary3 = @[@"0.6",@"0.3",@"0.4",@"0.3",@"0.3",@"0.4",@"0.5"];
+            NSMutableArray *ary = [NSMutableArray array];
+            NSMutableArray *ary2 = [NSMutableArray array];
+            NSMutableArray *ary3 = [NSMutableArray array];
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(500);
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary addObject:str];
+            }
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(1000);
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary2 addObject:str];
+            }
+            for (NSInteger i = 0; i < 7; i++) {
+                CGFloat num = arc4random_uniform(2000);
+                NSString *str = [NSString stringWithFormat:@"%f",num];
+                [ary3 addObject:str];
+            }
             return @[ary,ary2,ary3];
             break;
         }
diff --git a/SCChart/SCCircleCell.m b/SCChart/SCCircleCell.m
@@ -17,6 +17,24 @@ @interface SCCircleCell()
 
 @implementation SCCircleCell
 
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [btn setTitle:@"点击刷新数据" forState:UIControlStateNormal];
+        btn.titleLabel.font = [UIFont systemFontOfSize:12.0];;
+        [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        btn.frame = CGRectMake(0, 0, SCREEN_WIDTH, 27);
+        [btn addTarget:self action:@selector(btnPressed:) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:btn];
+    }
+    return self;
+}
+
+- (void)btnPressed:(id)sender {
+    CGFloat num = arc4random_uniform(60);
+    [chartView updateChartByCurrent:@(num)];
+}
+
 - (void)configUI:(NSIndexPath *)indexPath {
     if (chartView) {
         [chartView removeFromSuperview];
diff --git a/SCChart/SCPieCell.m b/SCChart/SCPieCell.m
@@ -17,6 +17,29 @@ @interface SCPieCell()
 
 @implementation SCPieCell
 
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [btn setTitle:@"点击刷新数据" forState:UIControlStateNormal];
+        btn.titleLabel.font = [UIFont systemFontOfSize:12.0];;
+        [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        btn.frame = CGRectMake(0, 0, SCREEN_WIDTH, 27);
+        [btn addTarget:self action:@selector(btnPressed:) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:btn];
+    }
+    return self;
+}
+
+- (void)btnPressed:(id)sender {
+    NSMutableArray *ary = [NSMutableArray array];
+    for (NSInteger i = 0; i < 3; i++) {
+        CGFloat num = arc4random_uniform(100);
+        NSString *str = [NSString stringWithFormat:@"%f",num];
+        [ary addObject:str];
+    }
+    [chartView updateChartByNumbers:ary];
+}
+
 - (void)configUI:(NSIndexPath *)indexPath {
     if (chartView) {
         [chartView removeFromSuperview];
diff --git a/SCChart/SCViewController.m b/SCChart/SCViewController.m
@@ -121,7 +121,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 170;
+    return 200;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`- (CGFloat)tableView:(UITableView )tableView heightForRowAtIndexPath:(NSIndexPath )indexPath {`
`124`		`- return 170;`
	`124`	`+ return 200;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`- (UIView )tableView:(UITableView )tableView viewForHeaderInSection:(NSInteger)section {`