merge

@@ -157,7 +157,7 @@ displayCountingLabel:(BOOL)displayCountingLabel
     [_circle addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
     [_circle addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
     _circle.strokeEnd   = [_current floatValue] / [_total floatValue];
     _circle.strokeEnd   = [_current floatValue] / [_total floatValue];
 
 
-    [_countingLabel countFrom:0 to:[_current floatValue] withDuration:self.duration];
+    [_countingLabel countFrom:0 to:[_current floatValue]/([_total floatValue]/100.0) withDuration:self.duration];
 
 
 
 
     // Check if user wants to add a gradient from the start color to the bar color
     // Check if user wants to add a gradient from the start color to the bar color
@@ -235,4 +235,4 @@ displayCountingLabel:(BOOL)displayCountingLabel
     _total = total;
     _total = total;
 }
 }
 
 
-@end
+@end

@@ -104,6 +104,20 @@
     }
     }
 }
 }
 
 
+- (CGFloat)computeEqualWidthForXLabels:(NSArray *)xLabels
+{
+    CGFloat xLabelWidth;
+
+    if (_showLabel) {
+        xLabelWidth = _chartCavanWidth / [xLabels count];
+    } else {
+        xLabelWidth = (self.frame.size.width) / [xLabels count];
+    }
+
+    return xLabelWidth;
+}
+
+
 - (void)setXLabels:(NSArray *)xLabels
 - (void)setXLabels:(NSArray *)xLabels
 {
 {
     CGFloat xLabelWidth;
     CGFloat xLabelWidth;

@@ -27,4 +27,11 @@
 	return item;
 	return item;
 }
 }
 
 
+- (void)setValue:(CGFloat)value{
+    NSAssert(value >= 0, @"value should >= 0");
+    if (value != _value){
+        _value = value;
+    }
+}
+
 @end
 @end

@@ -156,6 +156,24 @@
     }
     }
 }
 }
 
 
+- (NSArray*) getAxisMinMax:(NSArray*)xValues
+{
+    float min = [xValues[0] floatValue];
+    float max = [xValues[0] floatValue];
+    for (NSNumber *number in xValues)
+    {
+        if ([number floatValue] > max)
+            max = [number floatValue];
+        
+        if ([number floatValue] < min)
+            min = [number floatValue];
+    }
+    NSArray *result = @[[NSNumber numberWithFloat:min], [NSNumber numberWithFloat:max]];
+   
+    
+    return result;
+}
+
 - (void)setAxisXLabel:(NSArray *)array {
 - (void)setAxisXLabel:(NSArray *)array {
     if(array.count == ++_AxisX_partNumber){
     if(array.count == ++_AxisX_partNumber){
         [_axisX_labels removeAllObjects];
         [_axisX_labels removeAllObjects];

@@ -64,7 +64,6 @@ data02.getData = ^(NSUInteger index) {
 
 
 lineChart.chartData = @[data01, data02];
 lineChart.chartData = @[data01, data02];
 [lineChart strokeChart];
 [lineChart strokeChart];
-
 ```
 ```
 
 
 [![](https://dl.dropboxusercontent.com/u/1599662/bar.png)](https://dl.dropboxusercontent.com/u/1599662/bar.png)
 [![](https://dl.dropboxusercontent.com/u/1599662/bar.png)](https://dl.dropboxusercontent.com/u/1599662/bar.png)
@@ -150,6 +149,46 @@ CGPoint end = CGPointMake(80, 45);
 scatterChart.delegate = self;
 scatterChart.delegate = self;
 ```
 ```
 
 
+#### Legend
+
+Legend has been added to PNChart for Line and Pie Charts. Legend items position can be stacked or in series.
+
+[![](https://dl.dropboxusercontent.com/u/4904447/pnchart_legend_1.png)](https://dl.dropboxusercontent.com/u/4904447/pnchart_legend_1.png)
+
+[![](https://dl.dropboxusercontent.com/u/4904447/pnchart_legend_2.png)](https://dl.dropboxusercontent.com/u/4904447/pnchart_legend_2.png)
+
+```objective-c
+#import "PNChart.h"
+
+//For Line Chart
+
+//Add Line Titles for the Legend
+data01.dataTitle = @"Alpha";
+data02.dataTitle = @"Beta Beta Beta Beta";
+
+//Build the legend
+self.lineChart.legendStyle = PNLegendItemStyleSerial;
+self.lineChart.legendFontSize = 12.0;        
+UIView *legend = [self.lineChart getLegendWithMaxWidth:320];
+
+//Move legend to the desired position and add to view
+[legend setFrame:CGRectMake(100, 400, legend.frame.size.width, legend.frame.size.height)];
+[self.view addSubview:legend];
+
+
+//For Pie Chart
+
+//Build the legend
+self.pieChart.legendStyle = PNLegendItemStyleStacked;
+self.pieChart.legendFontSize = 12.0;
+UIView *legend = [self.pieChart getLegendWithMaxWidth:200];
+
+//Move legend to the desired position and add to view
+[legend setFrame:CGRectMake(130, 350, legend.frame.size.width, legend.frame.size.height)];
+[self.view addSubview:legend];
+```
+
+
 #### Update Value
 #### Update Value
 
 
 Now it's easy to update value in real time
 Now it's easy to update value in real time