Showing
4 changed files
with
2 additions
and
218 deletions
| @@ -28,7 +28,6 @@ | @@ -28,7 +28,6 @@ | ||
| 28 | 0AF7A8BE182AEB99003645C4 /* PNChartLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF7A8BB182AEB99003645C4 /* PNChartLabel.m */; }; | 28 | 0AF7A8BE182AEB99003645C4 /* PNChartLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF7A8BB182AEB99003645C4 /* PNChartLabel.m */; }; |
| 29 | 0AF7A8BF182AEB99003645C4 /* PNColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF7A8BD182AEB99003645C4 /* PNColor.m */; }; | 29 | 0AF7A8BF182AEB99003645C4 /* PNColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF7A8BD182AEB99003645C4 /* PNColor.m */; }; |
| 30 | 9F55483E18498E0E004073B5 /* PNCircleChart.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F55483D18498E0E004073B5 /* PNCircleChart.m */; }; | 30 | 9F55483E18498E0E004073B5 /* PNCircleChart.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F55483D18498E0E004073B5 /* PNCircleChart.m */; }; |
| 31 | - 9F656B51184A4E34002E5675 /* UICountingLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F656B50184A4E34002E5675 /* UICountingLabel.m */; }; | ||
| 32 | 9F9AFF24185FF24000D6673D /* PNLineChartData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9AFF21185FF24000D6673D /* PNLineChartData.m */; }; | 31 | 9F9AFF24185FF24000D6673D /* PNLineChartData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9AFF21185FF24000D6673D /* PNLineChartData.m */; }; |
| 33 | 9F9AFF25185FF24000D6673D /* PNLineChartDataItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9AFF23185FF24000D6673D /* PNLineChartDataItem.m */; }; | 32 | 9F9AFF25185FF24000D6673D /* PNLineChartDataItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9AFF23185FF24000D6673D /* PNLineChartDataItem.m */; }; |
| 34 | 9FA23B10184A5944002DBBA4 /* PCChartsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FA23B0F184A5944002DBBA4 /* PCChartsTableViewController.m */; }; | 33 | 9FA23B10184A5944002DBBA4 /* PCChartsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FA23B0F184A5944002DBBA4 /* PCChartsTableViewController.m */; }; |
| @@ -78,8 +77,6 @@ | @@ -78,8 +77,6 @@ | ||
| 78 | 0AF7A8BD182AEB99003645C4 /* PNColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNColor.m; path = PNChart/PNColor.m; sourceTree = "<group>"; }; | 77 | 0AF7A8BD182AEB99003645C4 /* PNColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNColor.m; path = PNChart/PNColor.m; sourceTree = "<group>"; }; |
| 79 | 9F55483C18498E0E004073B5 /* PNCircleChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNCircleChart.h; path = PNChart/PNCircleChart.h; sourceTree = "<group>"; }; | 78 | 9F55483C18498E0E004073B5 /* PNCircleChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNCircleChart.h; path = PNChart/PNCircleChart.h; sourceTree = "<group>"; }; |
| 80 | 9F55483D18498E0E004073B5 /* PNCircleChart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNCircleChart.m; path = PNChart/PNCircleChart.m; sourceTree = "<group>"; }; | 79 | 9F55483D18498E0E004073B5 /* PNCircleChart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNCircleChart.m; path = PNChart/PNCircleChart.m; sourceTree = "<group>"; }; |
| 81 | - 9F656B4F184A4E34002E5675 /* UICountingLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UICountingLabel.h; path = PNChart/ThirdPart/UICountingLabel.h; sourceTree = "<group>"; }; | ||
| 82 | - 9F656B50184A4E34002E5675 /* UICountingLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UICountingLabel.m; path = PNChart/ThirdPart/UICountingLabel.m; sourceTree = "<group>"; }; | ||
| 83 | 9F9AFF20185FF24000D6673D /* PNLineChartData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNLineChartData.h; path = PNChart/PNLineChartData.h; sourceTree = "<group>"; }; | 80 | 9F9AFF20185FF24000D6673D /* PNLineChartData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNLineChartData.h; path = PNChart/PNLineChartData.h; sourceTree = "<group>"; }; |
| 84 | 9F9AFF21185FF24000D6673D /* PNLineChartData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNLineChartData.m; path = PNChart/PNLineChartData.m; sourceTree = "<group>"; }; | 81 | 9F9AFF21185FF24000D6673D /* PNLineChartData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNLineChartData.m; path = PNChart/PNLineChartData.m; sourceTree = "<group>"; }; |
| 85 | 9F9AFF22185FF24000D6673D /* PNLineChartDataItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNLineChartDataItem.h; path = PNChart/PNLineChartDataItem.h; sourceTree = "<group>"; }; | 82 | 9F9AFF22185FF24000D6673D /* PNLineChartDataItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNLineChartDataItem.h; path = PNChart/PNLineChartDataItem.h; sourceTree = "<group>"; }; |
| @@ -250,8 +247,6 @@ | @@ -250,8 +247,6 @@ | ||
| 250 | 9F656B4B184A4BC9002E5675 /* PNCircleChart */ = { | 247 | 9F656B4B184A4BC9002E5675 /* PNCircleChart */ = { |
| 251 | isa = PBXGroup; | 248 | isa = PBXGroup; |
| 252 | children = ( | 249 | children = ( |
| 253 | - 9F656B4F184A4E34002E5675 /* UICountingLabel.h */, | ||
| 254 | - 9F656B50184A4E34002E5675 /* UICountingLabel.m */, | ||
| 255 | 9F55483C18498E0E004073B5 /* PNCircleChart.h */, | 250 | 9F55483C18498E0E004073B5 /* PNCircleChart.h */, |
| 256 | 9F55483D18498E0E004073B5 /* PNCircleChart.m */, | 251 | 9F55483D18498E0E004073B5 /* PNCircleChart.m */, |
| 257 | ); | 252 | ); |
| @@ -358,7 +353,6 @@ | @@ -358,7 +353,6 @@ | ||
| 358 | files = ( | 353 | files = ( |
| 359 | 0AF7A8AF182AAEEF003645C4 /* PCChartViewController.m in Sources */, | 354 | 0AF7A8AF182AAEEF003645C4 /* PCChartViewController.m in Sources */, |
| 360 | 9F9AFF25185FF24000D6673D /* PNLineChartDataItem.m in Sources */, | 355 | 9F9AFF25185FF24000D6673D /* PNLineChartDataItem.m in Sources */, |
| 361 | - 9F656B51184A4E34002E5675 /* UICountingLabel.m in Sources */, | ||
| 362 | 0AF7A8BF182AEB99003645C4 /* PNColor.m in Sources */, | 356 | 0AF7A8BF182AEB99003645C4 /* PNColor.m in Sources */, |
| 363 | 9FA23B10184A5944002DBBA4 /* PCChartsTableViewController.m in Sources */, | 357 | 9FA23B10184A5944002DBBA4 /* PCChartsTableViewController.m in Sources */, |
| 364 | 0AF7A8BE182AEB99003645C4 /* PNChartLabel.m in Sources */, | 358 | 0AF7A8BE182AEB99003645C4 /* PNChartLabel.m in Sources */, |
| 1 | -#import <Foundation/Foundation.h> | ||
| 2 | -#import <UIKit/UIKit.h> | ||
| 3 | - | ||
| 4 | -typedef enum { | ||
| 5 | - UILabelCountingMethodEaseInOut, | ||
| 6 | - UILabelCountingMethodEaseIn, | ||
| 7 | - UILabelCountingMethodEaseOut, | ||
| 8 | - UILabelCountingMethodLinear | ||
| 9 | -} UILabelCountingMethod; | ||
| 10 | - | ||
| 11 | -typedef NSString* (^UICountingLabelFormatBlock)(float value); | ||
| 12 | - | ||
| 13 | - | ||
| 14 | -@interface UICountingLabel : UILabel | ||
| 15 | - | ||
| 16 | -@property (nonatomic, strong) NSString *format; | ||
| 17 | -@property (nonatomic, assign) UILabelCountingMethod method; | ||
| 18 | - | ||
| 19 | -@property (nonatomic, copy) UICountingLabelFormatBlock formatBlock; | ||
| 20 | -@property (nonatomic, copy) void (^completionBlock)(); | ||
| 21 | - | ||
| 22 | - | ||
| 23 | --(void)countFrom:(float)startValue to:(float)endValue; | ||
| 24 | --(void)countFrom:(float)startValue to:(float)endValue withDuration:(NSTimeInterval)duration; | ||
| 25 | - | ||
| 26 | -@end | ||
| 27 | - |
| 1 | -#import "UICountingLabel.h" | ||
| 2 | - | ||
| 3 | -#if !__has_feature(objc_arc) | ||
| 4 | -#error UICountingLabel is ARC only. Either turn on ARC for the project or use -fobjc-arc flag | ||
| 5 | -#endif | ||
| 6 | - | ||
| 7 | -#pragma mark - UILabelCounter | ||
| 8 | - | ||
| 9 | -// This whole class & subclasses are private to UICountingLabel, which is why they are declared here in the .m file | ||
| 10 | - | ||
| 11 | -@interface UILabelCounter : NSObject | ||
| 12 | - | ||
| 13 | --(float)update:(float)t; | ||
| 14 | - | ||
| 15 | -@property float rate; | ||
| 16 | - | ||
| 17 | -@end | ||
| 18 | - | ||
| 19 | -@interface UILabelCounterLinear : UILabelCounter | ||
| 20 | - | ||
| 21 | -@end | ||
| 22 | - | ||
| 23 | -@interface UILabelCounterEaseIn : UILabelCounter | ||
| 24 | - | ||
| 25 | -@end | ||
| 26 | - | ||
| 27 | -@interface UILabelCounterEaseOut : UILabelCounter | ||
| 28 | - | ||
| 29 | -@end | ||
| 30 | - | ||
| 31 | -@interface UILabelCounterEaseInOut : UILabelCounter | ||
| 32 | - | ||
| 33 | -@end | ||
| 34 | - | ||
| 35 | -@implementation UILabelCounter | ||
| 36 | - | ||
| 37 | --(float)update:(float)t{ | ||
| 38 | - return 0; | ||
| 39 | -} | ||
| 40 | - | ||
| 41 | -@end | ||
| 42 | - | ||
| 43 | -@implementation UILabelCounterLinear | ||
| 44 | - | ||
| 45 | --(float)update:(float)t | ||
| 46 | -{ | ||
| 47 | - return t; | ||
| 48 | -} | ||
| 49 | - | ||
| 50 | -@end | ||
| 51 | - | ||
| 52 | -@implementation UILabelCounterEaseIn | ||
| 53 | - | ||
| 54 | --(float)update:(float)t | ||
| 55 | -{ | ||
| 56 | - return powf(t, self.rate); | ||
| 57 | -} | ||
| 58 | - | ||
| 59 | -@end | ||
| 60 | - | ||
| 61 | -@implementation UILabelCounterEaseOut | ||
| 62 | - | ||
| 63 | --(float)update:(float)t{ | ||
| 64 | - return 1.0-powf((1.0-t), self.rate); | ||
| 65 | -} | ||
| 66 | - | ||
| 67 | -@end | ||
| 68 | - | ||
| 69 | -@implementation UILabelCounterEaseInOut | ||
| 70 | - | ||
| 71 | --(float) update: (float) t | ||
| 72 | -{ | ||
| 73 | - int sign =1; | ||
| 74 | - int r = (int) self.rate; | ||
| 75 | - if (r % 2 == 0) | ||
| 76 | - sign = -1; | ||
| 77 | - t *= 2; | ||
| 78 | - if (t < 1) | ||
| 79 | - return 0.5f * powf (t, self.rate); | ||
| 80 | - else | ||
| 81 | - return sign*0.5f * (powf (t-2, self.rate) + sign*2); | ||
| 82 | -} | ||
| 83 | - | ||
| 84 | -@end | ||
| 85 | - | ||
| 86 | -#pragma mark - UICountingLabel | ||
| 87 | - | ||
| 88 | -@interface UICountingLabel () | ||
| 89 | - | ||
| 90 | -@property float startingValue; | ||
| 91 | -@property float destinationValue; | ||
| 92 | -@property NSTimeInterval progress; | ||
| 93 | -@property NSTimeInterval lastUpdate; | ||
| 94 | -@property NSTimeInterval totalTime; | ||
| 95 | -@property float easingRate; | ||
| 96 | - | ||
| 97 | -@property (nonatomic, strong) UILabelCounter* counter; | ||
| 98 | - | ||
| 99 | -@end | ||
| 100 | - | ||
| 101 | -@implementation UICountingLabel | ||
| 102 | - | ||
| 103 | --(void)countFrom:(float)value to:(float)endValue | ||
| 104 | -{ | ||
| 105 | - [self countFrom:value to:endValue withDuration:2.0f]; | ||
| 106 | -} | ||
| 107 | - | ||
| 108 | --(void)countFrom:(float)startValue to:(float)endValue withDuration:(NSTimeInterval)duration | ||
| 109 | -{ | ||
| 110 | - | ||
| 111 | - self.easingRate = 3.0f; | ||
| 112 | - self.startingValue = startValue; | ||
| 113 | - self.destinationValue = endValue; | ||
| 114 | - self.progress = 0; | ||
| 115 | - self.totalTime = duration; | ||
| 116 | - self.lastUpdate = [NSDate timeIntervalSinceReferenceDate]; | ||
| 117 | - | ||
| 118 | - if(self.format == nil) | ||
| 119 | - self.format = @"%f"; | ||
| 120 | - | ||
| 121 | - switch(self.method) | ||
| 122 | - { | ||
| 123 | - case UILabelCountingMethodLinear: | ||
| 124 | - self.counter = [[UILabelCounterLinear alloc] init]; | ||
| 125 | - break; | ||
| 126 | - case UILabelCountingMethodEaseIn: | ||
| 127 | - self.counter = [[UILabelCounterEaseIn alloc] init]; | ||
| 128 | - break; | ||
| 129 | - case UILabelCountingMethodEaseOut: | ||
| 130 | - self.counter = [[UILabelCounterEaseOut alloc] init]; | ||
| 131 | - break; | ||
| 132 | - case UILabelCountingMethodEaseInOut: | ||
| 133 | - self.counter = [[UILabelCounterEaseInOut alloc] init]; | ||
| 134 | - break; | ||
| 135 | - } | ||
| 136 | - | ||
| 137 | - self.counter.rate = 3.0f; | ||
| 138 | - | ||
| 139 | - NSTimer* timer = [NSTimer timerWithTimeInterval:(1.0f/30.0f) target:self selector:@selector(updateValue:) userInfo:nil repeats:YES]; | ||
| 140 | - [[NSRunLoop mainRunLoop] addTimer:timer forMode:NSRunLoopCommonModes]; | ||
| 141 | -} | ||
| 142 | - | ||
| 143 | --(void)updateValue:(NSTimer*)timer | ||
| 144 | -{ | ||
| 145 | - // update progress | ||
| 146 | - NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate]; | ||
| 147 | - self.progress += now - self.lastUpdate; | ||
| 148 | - self.lastUpdate = now; | ||
| 149 | - | ||
| 150 | - if(self.progress >= self.totalTime) | ||
| 151 | - { | ||
| 152 | - [timer invalidate]; | ||
| 153 | - self.progress = self.totalTime; | ||
| 154 | - } | ||
| 155 | - | ||
| 156 | - float percent = self.progress / self.totalTime; | ||
| 157 | - float updateVal =[self.counter update:percent]; | ||
| 158 | - float value = self.startingValue + (updateVal * (self.destinationValue - self.startingValue)); | ||
| 159 | - | ||
| 160 | - | ||
| 161 | - if(self.formatBlock != nil) | ||
| 162 | - { | ||
| 163 | - self.text = self.formatBlock(value); | ||
| 164 | - } | ||
| 165 | - else | ||
| 166 | - { | ||
| 167 | - // check if counting with ints - cast to int | ||
| 168 | - if([self.format rangeOfString:@"%(.*)d" options:NSRegularExpressionSearch].location != NSNotFound || [self.format rangeOfString:@"%(.*)i"].location != NSNotFound ) | ||
| 169 | - { | ||
| 170 | - self.text = [NSString stringWithFormat:self.format,(int)value]; | ||
| 171 | - } | ||
| 172 | - else | ||
| 173 | - { | ||
| 174 | - self.text = [NSString stringWithFormat:self.format,value]; | ||
| 175 | - } | ||
| 176 | - } | ||
| 177 | - | ||
| 178 | - if(self.progress == self.totalTime && self.completionBlock != nil) | ||
| 179 | - { | ||
| 180 | - self.completionBlock(); | ||
| 181 | - self.completionBlock = nil; | ||
| 182 | - } | ||
| 183 | -} | ||
| 184 | - | ||
| 185 | -@end |
-
Please register or login to post a comment