@@ -32,20 +32,9 @@
#import <QuartzCore/QuartzCore.h>
@class TKTimeGraph, TKTimeGraphPointsView, TKTimeGraphIndicator;
-
-@protocol TKTimeGraphDelegate <NSObject>
-@optional
-- (NSString*) titleForTimeGraph:(TKTimeGraph*)graph;
-- (NSNumber*) goalValueForTimeGraph:(TKTimeGraph*)graph;
-@required
-- (int) numberofPointsOnTimeGraph:(TKTimeGraph*)graph;
-- (NSNumber*) timeGraph:(TKTimeGraph*)graph yValueForPoint:(int)x;
-- (NSString*) timeGraph:(TKTimeGraph*)graph xLabelForPoint:(int)x;
-- (NSString*) timeGraph:(TKTimeGraph*)graph yLabelForValue:(float)value;
+@protocol TKTimeGraphDataSource;
-@end
-
@interface TKTimeGraph : UIView {
@@ -55,7 +44,7 @@
BOOL goal;
float goalValue;
NSMutableArray *data;
- id<TKTimeGraphDelegate> delegate;
+ id<TKTimeGraphDataSource> delegate;
// View
@@ -68,7 +57,7 @@
}
@property (retain,nonatomic) NSMutableArray *data;
-@property (assign) id<TKTimeGraphDelegate> delegate;
+@property (assign) id<TKTimeGraphDataSource> delegate;
- (void) setTitle:(NSString*)str;
@end
@@ -86,3 +75,18 @@
}
- (id)initWithFrame:(CGRect)frame title:(NSString*)str sideUp:(BOOL)up;
@end
+
+
+
+@protocol TKTimeGraphDataSource <NSObject>
+@optional
+- (NSString*) titleForTimeGraph:(TKTimeGraph*)graph;
+- (NSNumber*) goalValueForTimeGraph:(TKTimeGraph*)graph;
+@required
+- (int) numberofPointsOnTimeGraph:(TKTimeGraph*)graph;
+- (NSNumber*) timeGraph:(TKTimeGraph*)graph yValueForPoint:(int)x;
+- (NSString*) timeGraph:(TKTimeGraph*)graph xLabelForPoint:(int)x;
+- (NSString*) timeGraph:(TKTimeGraph*)graph yLabelForValue:(float)value;
+
+
+@end
\ No newline at end of file
TapkuLibrary/TKTimeGraph.h
@@ -88,48 +88,7 @@
return self;
}
-- (void)drawRect:(CGRect)rect {
- //NSLog(@"drawRect");
- // Drawing code
- if ([delegate respondsToSelector:@selector(titleForTimeGraph:)])
- title.text = [delegate titleForTimeGraph:self];
-
- if(data == nil){
-
- activity = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
- activity.center = CGPointMake(self.bounds.origin.x + self.bounds.size.width/2,self.bounds.origin.y + self.bounds.size.height/2);
- [self addSubview:activity];
- [activity startAnimating];
-
- [NSThread detachNewThreadSelector:@selector(getDelegateData) toTarget:self withObject:nil];
-
- }else{
- CGContextRef context = UIGraphicsGetCurrentContext();
- [self drawBackground:context];
- [self drawBottomLine:context];
- [self drawHorizontalLines:context];
-
- float width = ([data count] + 1) * pointDistance;
- float height = scrollView.frame.size.height;
-
- scrollView.contentSize = CGSizeMake(width,height);
-
- pointsView = [[TKTimeGraphPointsView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
- [pointsView setData:data];
- pointsView.backgroundColor = [UIColor clearColor];
- [scrollView addSubview:pointsView];
-
- if(goal)
- [self drawGoalLine:context];
-
- border = [[UIImageView alloc] initWithImage:[UIImage imageFromPath:TKBUNDLE(@"TapkuLibrary.bundle/Images/graph/mask.png")]];
- [self addSubview:border];
-
- }
-
-
-}
- (void) loadDelegateDataComplete{
@@ -197,6 +156,8 @@
if(yValue < lowValue) lowValue = yValue;
}
[data addObject:point];
+
+ [point release];
}
goal = NO;
NSNumber *g;
@@ -229,6 +190,49 @@
[pool release];
}
+- (void)drawRect:(CGRect)rect {
+
+
+ if ([delegate respondsToSelector:@selector(titleForTimeGraph:)])
+ title.text = [delegate titleForTimeGraph:self];
+
+
+ if(data == nil){
+
+ activity = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+ activity.center = CGPointMake(self.bounds.origin.x + self.bounds.size.width/2,self.bounds.origin.y + self.bounds.size.height/2);
+ [self addSubview:activity];
+ [activity startAnimating];
+
+ [NSThread detachNewThreadSelector:@selector(getDelegateData) toTarget:self withObject:nil];
+
+ }else{
+ CGContextRef context = UIGraphicsGetCurrentContext();
+ [self drawBackground:context];
+ [self drawBottomLine:context];
+ [self drawHorizontalLines:context];
+
+ float width = ([data count] + 1) * pointDistance;
+ float height = scrollView.frame.size.height;
+
+ scrollView.contentSize = CGSizeMake(width,height);
+
+ pointsView = [[TKTimeGraphPointsView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
+ [pointsView setData:data];
+ pointsView.backgroundColor = [UIColor clearColor];
+ [scrollView addSubview:pointsView];
+
+ if(goal)
+ [self drawGoalLine:context];
+
+ border = [[UIImageView alloc] initWithImage:[UIImage imageFromPath:TKBUNDLE(@"TapkuLibrary.bundle/Images/graph/mask.png")]];
+ [self addSubview:border];
+
+ }
+
+
+}
+
- (void) drawBackground:(CGContextRef)context{
// GRAY BACKGROUND
CGContextSetRGBFillColor(context, 1, 1, 1, 1.0);
@@ -302,14 +306,20 @@
}
- (void) drawGoalLine:(CGContextRef)context{
- UIImage *img = [UIImage imageFromPath:TKBUNDLE(@"TapkuLibrary.bundle/Images/graph/goalline.png")];
+ /*UIImage *img = [UIImage imageFromPath:TKBUNDLE(@"TapkuLibrary.bundle/Images/graph/goalline.png")];
+
UIImageView *image = [[UIImageView alloc] initWithImage:img];
int y = [self valueToYCoordinate:goalValue];
CGRect r = image.frame;
r.origin.y = stageHeight + stageTopMargin - y - 19;
image.frame=r;
[self addSubview:image];
- [image release];
+ [image release];*/
+
+ UIImage *img = [UIImage imageFromPath:TKBUNDLE(@"TapkuLibrary.bundle/Images/graph/goalline.png")];
+ //481x19
+ [img drawInRect:CGRectMake(0, 0.5 + stageHeight + stageTopMargin - [self valueToYCoordinate:goalValue] - 19, 481, 19)];
+
}
@@ -340,9 +350,6 @@
@end
-
-
-
@implementation TKTimeGraphPointsView
@synthesize data;
@@ -450,7 +457,6 @@
}
}
-
- (void) drawRect:(CGRect)rect {
CGContextRef context = UIGraphicsGetCurrentContext();
TapkuLibrary/TKTimeGraph.m
@@ -32,7 +32,7 @@
#import "TKTimeGraph.h"
-@interface TKTimeGraphController : UIViewController <TKTimeGraphDelegate> {
+@interface TKTimeGraphController : UIViewController <TKTimeGraphDataSource> {
UIButton *close;
TKTimeGraph *timeGraph;
UIStatusBarStyle statusColor;
TapkuLibrary/TKTimeGraphController.h
5304772c31c1eee80b0a67c2ae336f5516286e40
tapku
support@tapku.com
http://github.com/sync/tapkulibrary/commit/37db5c30ff01ffacbff3bb494fadb2f9ac7bc73d
37db5c30ff01ffacbff3bb494fadb2f9ac7bc73d
2009-10-25T10:35:09-07:00
2009-10-25T10:35:09-07:00
Graph changes
faf00566ac121f3779e49785ec2dcddab16a8b32
tapku
support@tapku.com