Showing
9 changed files
with
2 additions
and
17 deletions
| @@ -20,6 +20,7 @@ | @@ -20,6 +20,7 @@ | ||
| 20 | CGContextFillRect(context, rect); | 20 | CGContextFillRect(context, rect); |
| 21 | UIImage *img = UIGraphicsGetImageFromCurrentImageContext(); | 21 | UIImage *img = UIGraphicsGetImageFromCurrentImageContext(); |
| 22 | UIGraphicsEndImageContext(); | 22 | UIGraphicsEndImageContext(); |
| 23 | + | ||
| 23 | return img; | 24 | return img; |
| 24 | } | 25 | } |
| 25 | 26 |
| @@ -20,7 +20,6 @@ | @@ -20,7 +20,6 @@ | ||
| 20 | @property (nonatomic, retain) id<PNChartDelegate> delegate; | 20 | @property (nonatomic, retain) id<PNChartDelegate> delegate; |
| 21 | 21 | ||
| 22 | @property (nonatomic) NSArray *xLabels; | 22 | @property (nonatomic) NSArray *xLabels; |
| 23 | - | ||
| 24 | @property (nonatomic) NSArray *yLabels; | 23 | @property (nonatomic) NSArray *yLabels; |
| 25 | 24 | ||
| 26 | /** | 25 | /** |
| @@ -29,31 +28,18 @@ | @@ -29,31 +28,18 @@ | ||
| 29 | @property (nonatomic) NSArray *chartData; | 28 | @property (nonatomic) NSArray *chartData; |
| 30 | 29 | ||
| 31 | @property (nonatomic) NSMutableArray *pathPoints; | 30 | @property (nonatomic) NSMutableArray *pathPoints; |
| 32 | - | ||
| 33 | @property (nonatomic) CGFloat xLabelWidth; | 31 | @property (nonatomic) CGFloat xLabelWidth; |
| 34 | - | ||
| 35 | @property (nonatomic) UIFont *xLabelFont; | 32 | @property (nonatomic) UIFont *xLabelFont; |
| 36 | - | ||
| 37 | @property (nonatomic) UIColor *xLabelColor; | 33 | @property (nonatomic) UIColor *xLabelColor; |
| 38 | - | ||
| 39 | @property (nonatomic) CGFloat yValueMax; | 34 | @property (nonatomic) CGFloat yValueMax; |
| 40 | - | ||
| 41 | @property (nonatomic) CGFloat yValueMin; | 35 | @property (nonatomic) CGFloat yValueMin; |
| 42 | - | ||
| 43 | @property (nonatomic) NSInteger yLabelNum; | 36 | @property (nonatomic) NSInteger yLabelNum; |
| 44 | - | ||
| 45 | @property (nonatomic) CGFloat yLabelHeight; | 37 | @property (nonatomic) CGFloat yLabelHeight; |
| 46 | - | ||
| 47 | @property (nonatomic) UIFont *yLabelFont; | 38 | @property (nonatomic) UIFont *yLabelFont; |
| 48 | - | ||
| 49 | @property (nonatomic) UIColor *yLabelColor; | 39 | @property (nonatomic) UIColor *yLabelColor; |
| 50 | - | ||
| 51 | @property (nonatomic) CGFloat chartCavanHeight; | 40 | @property (nonatomic) CGFloat chartCavanHeight; |
| 52 | - | ||
| 53 | @property (nonatomic) CGFloat chartCavanWidth; | 41 | @property (nonatomic) CGFloat chartCavanWidth; |
| 54 | - | ||
| 55 | @property (nonatomic) CGFloat chartMargin; | 42 | @property (nonatomic) CGFloat chartMargin; |
| 56 | - | ||
| 57 | @property (nonatomic) BOOL showLabel; | 43 | @property (nonatomic) BOOL showLabel; |
| 58 | 44 | ||
| 59 | /** | 45 | /** |
| @@ -6,7 +6,6 @@ | @@ -6,7 +6,6 @@ | ||
| 6 | #import <Foundation/Foundation.h> | 6 | #import <Foundation/Foundation.h> |
| 7 | 7 | ||
| 8 | typedef NS_ENUM(NSUInteger, PNLineChartPointStyle) { | 8 | typedef NS_ENUM(NSUInteger, PNLineChartPointStyle) { |
| 9 | - | ||
| 10 | PNLineChartPointStyleNone = 0, | 9 | PNLineChartPointStyleNone = 0, |
| 11 | PNLineChartPointStyleCircle = 1, | 10 | PNLineChartPointStyleCircle = 1, |
| 12 | PNLineChartPointStyleSquare = 3 | 11 | PNLineChartPointStyleSquare = 3 |
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | 21 | ||
| 22 | + (instancetype)dataItemWithValue:(CGFloat)value | 22 | + (instancetype)dataItemWithValue:(CGFloat)value |
| 23 | color:(UIColor*)color | 23 | color:(UIColor*)color |
| 24 | - description:(NSString *)description{ | 24 | + description:(NSString *)description { |
| 25 | PNPieChartDataItem *item = [PNPieChartDataItem dataItemWithValue:value color:color]; | 25 | PNPieChartDataItem *item = [PNPieChartDataItem dataItemWithValue:value color:color]; |
| 26 | item.textDescription = description; | 26 | item.textDescription = description; |
| 27 | return item; | 27 | return item; |
-
Please register or login to post a comment