Merge branch 'master1'

andi
Commit 596f47fc582e2c0c11c91f767f61680f25ccdf33 596f47fc 2 parents 4fe91085 07e9632d
Showing 5 changed files with 161 additions and 102 deletions
PNChart/PNCircleChart.m
PNChart/PNLineChart.m
PNChart/PNPieChart.m
PNChart/PNPieChartDataItem.m
PNChart/PNScatterChart.m
--- a/PNChart/PNCircleChart.m
View file @596f47f
+++ b/PNChart/PNCircleChart.m
View file @596f47f
@@ -157,7 +157,7 @@ displayCountingLabel:(BOOL)displayCountingLabel
     [_circle addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
     _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
@@ -235,4 +235,4 @@ displayCountingLabel:(BOOL)displayCountingLabel
     _total = total;
 }
-@end
+@end
--- a/PNChart/PNLineChart.m
View file @596f47f
+++ b/PNChart/PNLineChart.m
View file @596f47f
@@ -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
 {
     CGFloat xLabelWidth;
--- a/PNChart/PNPieChart.m
View file @596f47f
+++ b/PNChart/PNPieChart.m
View file @596f47f
@@ -12,21 +12,24 @@
 @interface PNPieChart()
-@property (nonatomic, readwrite) NSArray	*items;
+@property (nonatomic) NSArray *items;
-@property (nonatomic) CGFloat total;
+@property (nonatomic) NSArray *endPercentages;
-@property (nonatomic) CGFloat currentTotal;
 @property (nonatomic) CGFloat outerCircleRadius;
 @property (nonatomic) CGFloat innerCircleRadius;
-@property (nonatomic) UIView  *contentView;
+@property (nonatomic) UIView         *contentView;
-@property (nonatomic) CAShapeLayer *pieLayer;
+@property (nonatomic) CAShapeLayer   *pieLayer;
 @property (nonatomic) NSMutableArray *descriptionLabels;
+
 - (void)loadDefault;
 - (UILabel *)descriptionLabelForItemAtIndex:(NSUInteger)index;
 - (PNPieChartDataItem *)dataItemForIndex:(NSUInteger)index;
+- (CGFloat)startPercentageForItemAtIndex:(NSUInteger)index;
+- (CGFloat)endPercentageForItemAtIndex:(NSUInteger)index;
+- (CGFloat)ratioForItemAtIndex:(NSUInteger)index;
 - (CAShapeLayer *)newCircleLayerWithRadius:(CGFloat)radius
                                borderWidth:(CGFloat)borderWidth
@@ -42,89 +45,86 @@
 @implementation PNPieChart
 -(id)initWithFrame:(CGRect)frame items:(NSArray *)items{
-	self = [self initWithFrame:frame];
+    self = [self initWithFrame:frame];
-	if(self){
+    if(self){
-		_items = [NSArray arrayWithArray:items];
+        _items = [NSArray arrayWithArray:items];
-		_outerCircleRadius = CGRectGetWidth(self.bounds)/2;
+        _outerCircleRadius  = CGRectGetWidth(self.bounds) / 2;
-		_innerCircleRadius  = CGRectGetWidth(self.bounds)/6;
+        _innerCircleRadius  = CGRectGetWidth(self.bounds) / 6;
-		
+        
-		_descriptionTextColor = [UIColor whiteColor];
+        _descriptionTextColor = [UIColor whiteColor];
-		_descriptionTextFont  = [UIFont fontWithName:@"Avenir-Medium" size:18.0];
+        _descriptionTextFont  = [UIFont fontWithName:@"Avenir-Medium" size:18.0];
-        _descriptionTextShadowColor = [[UIColor blackColor] colorWithAlphaComponent:0.4];
+        _descriptionTextShadowColor  = [[UIColor blackColor] colorWithAlphaComponent:0.4];
         _descriptionTextShadowOffset =  CGSizeMake(0, 1);
-		_duration = 1.0;
+        _duration = 1.0;
-		[self loadDefault];
+        [self loadDefault];
-	}
+    }
-	
+    
-	return self;
+    return self;
 }
-
 - (void)loadDefault{
-	_currentTotal = 0;
+    __block CGFloat currentTotal = 0;
-	_total       = 0;
+    CGFloat total = [[self.items valueForKeyPath:@"@sum.value"] floatValue];
-	
+    NSMutableArray *endPercentages = [NSMutableArray new];
-	[_contentView removeFromSuperview];
+    [_items enumerateObjectsUsingBlock:^(PNPieChartDataItem *item, NSUInteger idx, BOOL *stop) {
-	_contentView = [[UIView alloc] initWithFrame:self.bounds];
+        if (total == 0){
-	[self addSubview:_contentView];
+            [endPercentages addObject:@(1.0 / _items.count * (idx + 1))];
-    [_descriptionLabels removeAllObjects];
+        }else{
-	_descriptionLabels = [NSMutableArray new];
+            currentTotal += item.value;
-	
+            [endPercentages addObject:@(currentTotal / total)];
-	_pieLayer = [CAShapeLayer layer];
+        }
-	[_contentView.layer addSublayer:_pieLayer];
+    }];
+    self.endPercentages = [endPercentages copy];
+    
+    [_contentView removeFromSuperview];
+    _contentView = [[UIView alloc] initWithFrame:self.bounds];
+    [self addSubview:_contentView];
+    _descriptionLabels = [NSMutableArray new];
+    
+    _pieLayer = [CAShapeLayer layer];
+    [_contentView.layer addSublayer:_pieLayer];
 }
 #pragma mark -
 - (void)strokeChart{
-	[self loadDefault];
+    [self loadDefault];
-	
+    
-	[self.items enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+    PNPieChartDataItem *currentItem;
-		_total +=((PNPieChartDataItem *)obj).value;
+    for (int i = 0; i < _items.count; i++) {
-	}];
+        currentItem = [self dataItemForIndex:i];
-	
+        
-	PNPieChartDataItem *currentItem;
+        
-	CGFloat currentValue = 0;
+        CGFloat startPercnetage = [self startPercentageForItemAtIndex:i];
-	for (int i = 0; i < _items.count; i++) {
+        CGFloat endPercentage   = [self endPercentageForItemAtIndex:i];
-		currentItem = [self dataItemForIndex:i];
+        
-		
+        CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
-		
+        CGFloat borderWidth = _outerCircleRadius - _innerCircleRadius;
-		CGFloat startPercnetage = currentValue/_total;
+        CAShapeLayer *currentPieLayer =	[self newCircleLayerWithRadius:radius
-		CGFloat endPercentage   = (currentValue + currentItem.value)/_total;
+                                                           borderWidth:borderWidth
-		
-		CAShapeLayer *currentPieLayer =	[self newCircleLayerWithRadius:_innerCircleRadius + (_outerCircleRadius - _innerCircleRadius)/2
-                                                           borderWidth:_outerCircleRadius - _innerCircleRadius
                                                              fillColor:[UIColor clearColor]
                                                            borderColor:currentItem.color
                                                        startPercentage:startPercnetage
                                                          endPercentage:endPercentage];
-		[_pieLayer addSublayer:currentPieLayer];
+        [_pieLayer addSublayer:currentPieLayer];
-		
+    }
-		currentValue+=currentItem.value;
+    
-		
+    [self maskChart];
-	}
+    
-	
-	[self maskChart];
-	
-	currentValue = 0;
     for (int i = 0; i < _items.count; i++) {
-		currentItem = [self dataItemForIndex:i];
+        UILabel *descriptionLabel =  [self descriptionLabelForItemAtIndex:i];
-		UILabel *descriptionLabel =  [self descriptionLabelForItemAtIndex:i];
+        [_contentView addSubview:descriptionLabel];
-		[_contentView addSubview:descriptionLabel];
-		currentValue+=currentItem.value;
         [_descriptionLabels addObject:descriptionLabel];
-	}
+    }
 }
 - (UILabel *)descriptionLabelForItemAtIndex:(NSUInteger)index{
-	PNPieChartDataItem *currentDataItem = [self dataItemForIndex:index];
+    PNPieChartDataItem *currentDataItem = [self dataItemForIndex:index];
     CGFloat distance = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
-    CGFloat centerPercentage =(_currentTotal + currentDataItem.value /2 ) / _total;
+    CGFloat centerPercentage = ([self startPercentageForItemAtIndex:index] + [self endPercentageForItemAtIndex:index])/ 2;
     CGFloat rad = centerPercentage * 2 * M_PI;
-	_currentTotal += currentDataItem.value;
-	
     UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 80)];
     NSString *titleText = currentDataItem.textDescription;
     NSString *titleValue;
@@ -141,28 +141,44 @@
         NSString* str = [titleValue stringByAppendingString:[NSString stringWithFormat:@"\n%@",titleText]];
         descriptionLabel.text = str ;
     }
+    descriptionLabel.text = titleText;
     CGPoint center = CGPointMake(_outerCircleRadius + distance * sin(rad),
                                  _outerCircleRadius - distance * cos(rad));
     descriptionLabel.font = _descriptionTextFont;
     CGSize labelSize = [descriptionLabel.text sizeWithAttributes:@{NSFontAttributeName:descriptionLabel.font}];
-    descriptionLabel.frame = CGRectMake(
+    descriptionLabel.frame = CGRectMake(descriptionLabel.frame.origin.x, descriptionLabel.frame.origin.y,
-                             descriptionLabel.frame.origin.x, descriptionLabel.frame.origin.y,
+                                        descriptionLabel.frame.size.width, labelSize.height);
-                             descriptionLabel.frame.size.width, labelSize.height);
+    descriptionLabel.numberOfLines   = 0;
-    descriptionLabel.numberOfLines = 0;
+    descriptionLabel.textColor       = _descriptionTextColor;
-    descriptionLabel.textColor = _descriptionTextColor;
+    descriptionLabel.shadowColor     = _descriptionTextShadowColor;
-    descriptionLabel.shadowColor = _descriptionTextShadowColor;
+    descriptionLabel.shadowOffset    = _descriptionTextShadowOffset;
-    descriptionLabel.shadowOffset = _descriptionTextShadowOffset;
+    descriptionLabel.textAlignment   = NSTextAlignmentCenter;
-    descriptionLabel.textAlignment = NSTextAlignmentCenter;
+    descriptionLabel.center          = center;
-    descriptionLabel.center = center;
+    descriptionLabel.alpha           = 0;
-    descriptionLabel.alpha = 0;
     descriptionLabel.backgroundColor = [UIColor clearColor];
-	return descriptionLabel;
+    return descriptionLabel;
 }
 - (PNPieChartDataItem *)dataItemForIndex:(NSUInteger)index{
-	return self.items[index];
+    return self.items[index];
+}
+
+- (CGFloat)startPercentageForItemAtIndex:(NSUInteger)index{
+    if(index == 0){
+        return 0;
+    }
+    
+    return [_endPercentages[index - 1] floatValue];
+}
+
+- (CGFloat)endPercentageForItemAtIndex:(NSUInteger)index{
+    return [_endPercentages[index] floatValue];
+}
+
+- (CGFloat)ratioForItemAtIndex:(NSUInteger)index{
+    return [self endPercentageForItemAtIndex:index] - [self startPercentageForItemAtIndex:index];
 }
 #pragma mark private methods
@@ -190,38 +206,42 @@
     circle.lineWidth   = borderWidth;
     circle.path        = path.CGPath;
-	
+    return circle;
-	return circle;
 }
 - (void)maskChart{
-	CAShapeLayer *maskLayer =	[self newCircleLayerWithRadius:_innerCircleRadius + (_outerCircleRadius - _innerCircleRadius)/2
+    CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
-                                                 borderWidth:_outerCircleRadius - _innerCircleRadius
+    CGFloat borderWidth = _outerCircleRadius - _innerCircleRadius;
+    CAShapeLayer *maskLayer = [self newCircleLayerWithRadius:radius
+                                                 borderWidth:borderWidth
                                                    fillColor:[UIColor clearColor]
                                                  borderColor:[UIColor blackColor]
                                              startPercentage:0
                                                endPercentage:1];
-	
+    
-	_pieLayer.mask = maskLayer;
+    _pieLayer.mask = maskLayer;
-	CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
+    CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
-	animation.duration  = _duration;
+    animation.duration  = _duration;
-	animation.fromValue = @0;
+    animation.fromValue = @0;
-	animation.toValue   = @1;
+    animation.toValue   = @1;
     animation.delegate  = self;
-	animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-	animation.removedOnCompletion = YES;
+    animation.removedOnCompletion = YES;
-	[maskLayer addAnimation:animation forKey:@"circleAnimation"];
+    [maskLayer addAnimation:animation forKey:@"circleAnimation"];
 }
-- (void)createArcAnimationForLayer:(CAShapeLayer *)layer ForKey:(NSString *)key fromValue:(NSNumber *)from toValue:(NSNumber *)to Delegate:(id)delegate
+- (void)createArcAnimationForLayer:(CAShapeLayer *)layer
-{
+                            forKey:(NSString *)key
-	CABasicAnimation *arcAnimation = [CABasicAnimation animationWithKeyPath:key];
+                         fromValue:(NSNumber *)from
-	arcAnimation.fromValue = @0;
+                           toValue:(NSNumber *)to
-	[arcAnimation setToValue:to];
+                          delegate:(id)delegate{
-	[arcAnimation setDelegate:delegate];
+    CABasicAnimation *arcAnimation = [CABasicAnimation animationWithKeyPath:key];
-	[arcAnimation setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]];
+    arcAnimation.fromValue         = @0;
-	[layer addAnimation:arcAnimation forKey:key];
+    arcAnimation.toValue           = to;
-	[layer setValue:to forKey:key];
+    arcAnimation.delegate          = delegate;
+    arcAnimation.timingFunction    = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault];
+    [layer addAnimation:arcAnimation forKey:key];
+    [layer setValue:to forKey:key];
 }
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
--- a/PNChart/PNPieChartDataItem.m
View file @596f47f
+++ b/PNChart/PNPieChartDataItem.m
View file @596f47f
@@ -27,4 +27,11 @@
 	return item;
 }
+- (void)setValue:(CGFloat)value{
+    NSAssert(value >= 0, @"value should >= 0");
+    if (value != _value){
+        _value = value;
+    }
+}
+
 @end
--- a/PNChart/PNScatterChart.m
View file @596f47f
+++ b/PNChart/PNScatterChart.m
View file @596f47f
@@ -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 {
     if(array.count == ++_AxisX_partNumber){
         [_axisX_labels removeAllObjects];