Merge branch 'master' of github.com:kevinzhow/PNChart

@@ -11,7 +11,11 @@
 #import "PNChartLabel.h"
 #import "PNChartLabel.h"
 #import "PNBar.h"
 #import "PNBar.h"
 
 
-@interface PNBarChart()
+@interface PNBarChart() {
+    NSMutableArray* _bars;
+    NSMutableArray* _labels;
+}
+
 - (UIColor *)barColorAtIndex:(NSUInteger)index;
 - (UIColor *)barColorAtIndex:(NSUInteger)index;
 @end
 @end
 
 
@@ -26,8 +30,10 @@
         self.clipsToBounds   = YES;
         self.clipsToBounds   = YES;
         _showLabel           = YES;
         _showLabel           = YES;
         _barBackgroundColor  = PNLightGrey;
         _barBackgroundColor  = PNLightGrey;
+        _labels              = [NSMutableArray array];
+        _bars                = [NSMutableArray array];
     }
     }
-    
+
     return self;
     return self;
 }
 }
 
 
@@ -35,7 +41,7 @@
 {
 {
     _yValues = yValues;
     _yValues = yValues;
     [self setYLabels:yValues];
     [self setYLabels:yValues];
-    
+
     _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count];
     _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count];
 }
 }
 
 
@@ -47,36 +53,38 @@
         if (value > max) {
         if (value > max) {
             max = value;
             max = value;
         }
         }
-        
+
     }
     }
-    
+
     //Min value for Y label
     //Min value for Y label
     if (max < 5) {
     if (max < 5) {
         max = 5;
         max = 5;
     }
     }
-    
+
     _yValueMax = (int)max;
     _yValueMax = (int)max;
-    
-	
+
+
 }
 }
 
 
 -(void)setXLabels:(NSArray *)xLabels
 -(void)setXLabels:(NSArray *)xLabels
 {
 {
+    [self viewCleanupForCollection:_labels];
     _xLabels = xLabels;
     _xLabels = xLabels;
-    
+
     if (_showLabel) {
     if (_showLabel) {
         _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count];
         _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count];
-        
+
         for(int index = 0; index < xLabels.count; index++)
         for(int index = 0; index < xLabels.count; index++)
         {
         {
             NSString* labelText = xLabels[index];
             NSString* labelText = xLabels[index];
             PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin), self.frame.size.height - 30.0, _xLabelWidth, 20.0)];
             PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin), self.frame.size.height - 30.0, _xLabelWidth, 20.0)];
             [label setTextAlignment:NSTextAlignmentCenter];
             [label setTextAlignment:NSTextAlignmentCenter];
             label.text = labelText;
             label.text = labelText;
+            [_labels addObject:label];
             [self addSubview:label];
             [self addSubview:label];
         }
         }
     }
     }
-    
+
 }
 }
 
 
 -(void)setStrokeColor:(UIColor *)strokeColor
 -(void)setStrokeColor:(UIColor *)strokeColor
@@ -86,13 +94,13 @@
 
 
 -(void)strokeChart
 -(void)strokeChart
 {
 {
-
+    [self viewCleanupForCollection:_bars];
     CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0;
     CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0;
     NSInteger index = 0;
     NSInteger index = 0;
-	
+
     for (NSString * valueString in _yValues) {
     for (NSString * valueString in _yValues) {
         float value = [valueString floatValue];
         float value = [valueString floatValue];
-        
+
         float grade = (float)value / (float)_yValueMax;
         float grade = (float)value / (float)_yValueMax;
 		PNBar * bar;
 		PNBar * bar;
         if (_showLabel) {
         if (_showLabel) {
@@ -100,15 +108,24 @@
         }else{
         }else{
             bar = [[PNBar alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin + _xLabelWidth * 0.25), self.frame.size.height - chartCavanHeight , _xLabelWidth * 0.6, chartCavanHeight)];
             bar = [[PNBar alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin + _xLabelWidth * 0.25), self.frame.size.height - chartCavanHeight , _xLabelWidth * 0.6, chartCavanHeight)];
         }
         }
-		bar.backgroundColor = _barBackgroundColor;
-		bar.barColor = [self barColorAtIndex:index];
-		bar.grade = grade;
-		[self addSubview:bar];
-        
+        bar.backgroundColor = _barBackgroundColor;
+        bar.barColor = [self barColorAtIndex:index];
+        bar.grade = grade;
+        [_bars addObject:bar];
+        [self addSubview:bar];
+
         index += 1;
         index += 1;
     }
     }
 }
 }
 
 
+- (void)viewCleanupForCollection:(NSMutableArray*)array
+{
+    if (array.count) {
+        [array makeObjectsPerformSelector:@selector(removeFromSuperview)];
+        [array removeAllObjects];
+    }
+}
+
 #pragma mark - Class extension methods
 #pragma mark - Class extension methods
 
 
 - (UIColor *)barColorAtIndex:(NSUInteger)index
 - (UIColor *)barColorAtIndex:(NSUInteger)index
@@ -120,4 +137,4 @@
     }
     }
 }
 }
 
 
-@end
+@end