Format code

Zhang Hang
Commit 9c2c94b3c80aed26c41f7be72a0d4ebbf64cd675 9c2c94b3 1 parent 12924184
Showing 1 changed file with 30 additions and 28 deletions
PNChart/PNPieChart.m
--- a/PNChart/PNPieChart.m
View file @9c2c94b
+++ b/PNChart/PNPieChart.m
View file @9c2c94b
@@ -10,14 +10,14 @@
 @interface PNPieChart()
-@property (nonatomic, readwrite) NSArray	*items;
+@property (nonatomic) NSArray *items;
 @property (nonatomic) NSArray *endPercentages;
 @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;
@@ -28,6 +28,7 @@
 - (CGFloat)startPercentageForItemAtIndex:(NSUInteger)index;
 - (CGFloat)endPercentageForItemAtIndex:(NSUInteger)index;
 - (CGFloat)ratioForItemAtIndex:(NSUInteger)index;
+
 - (CAShapeLayer *)newCircleLayerWithRadius:(CGFloat)radius
                                borderWidth:(CGFloat)borderWidth
                                  fillColor:(UIColor *)fillColor
@@ -45,12 +46,12 @@
     self = [self initWithFrame:frame];
     if(self){
         _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];
         _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;
@@ -66,10 +67,10 @@
     NSMutableArray *endPercentages = [NSMutableArray new];
     [_items enumerateObjectsUsingBlock:^(PNPieChartDataItem *item, NSUInteger idx, BOOL *stop) {
         if (total == 0){
-            [endPercentages addObject:@(1.0/_items.count*(idx+1))];
+            [endPercentages addObject:@(1.0 / _items.count * (idx + 1))];
         }else{
             currentTotal += item.value;
-            [endPercentages addObject:@(currentTotal/total)];
+            [endPercentages addObject:@(currentTotal / total)];
         }
     }];
     self.endPercentages = [endPercentages copy];
@@ -96,7 +97,7 @@
         CGFloat startPercnetage = [self startPercentageForItemAtIndex:i];
         CGFloat endPercentage   = [self endPercentageForItemAtIndex:i];
-        CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius)/2;
+        CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
         CGFloat borderWidth = _outerCircleRadius - _innerCircleRadius;
         CAShapeLayer *currentPieLayer =	[self newCircleLayerWithRadius:radius
                                                            borderWidth:borderWidth
@@ -119,7 +120,7 @@
 - (UILabel *)descriptionLabelForItemAtIndex:(NSUInteger)index{
     PNPieChartDataItem *currentDataItem = [self dataItemForIndex:index];
     CGFloat distance = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
-    CGFloat centerPercentage = ([self startPercentageForItemAtIndex:index] + [self endPercentageForItemAtIndex:index])/2;
+    CGFloat centerPercentage = ([self startPercentageForItemAtIndex:index] + [self endPercentageForItemAtIndex:index])/ 2;
     CGFloat rad = centerPercentage * 2 * M_PI;
     UILabel *descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 80)];
@@ -139,16 +140,15 @@
     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.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;
 }
@@ -198,14 +198,13 @@
     circle.lineWidth   = borderWidth;
     circle.path        = path.CGPath;
-    
     return circle;
 }
 - (void)maskChart{
-    CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius)/2;
+    CGFloat radius = _innerCircleRadius + (_outerCircleRadius - _innerCircleRadius) / 2;
     CGFloat borderWidth = _outerCircleRadius - _innerCircleRadius;
-    CAShapeLayer *maskLayer =	[self newCircleLayerWithRadius:radius
+    CAShapeLayer *maskLayer = [self newCircleLayerWithRadius:radius
                                                  borderWidth:borderWidth
                                                    fillColor:[UIColor clearColor]
                                                  borderColor:[UIColor blackColor]
@@ -223,13 +222,16 @@
     [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
+                         fromValue:(NSNumber *)from
+                           toValue:(NSNumber *)to
+                          delegate:(id)delegate{
     CABasicAnimation *arcAnimation = [CABasicAnimation animationWithKeyPath:key];
-    arcAnimation.fromValue = @0;
+    arcAnimation.fromValue         = @0;
-    arcAnimation.toValue = to;
+    arcAnimation.toValue           = to;
-    arcAnimation.delegate = delegate;
+    arcAnimation.delegate          = delegate;
-    arcAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault];
+    arcAnimation.timingFunction    = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault];
     [layer addAnimation:arcAnimation forKey:key];
     [layer setValue:to forKey:key];
 }