reset gesture timer

kevTheDev · Jul 15, 2009 · cb608f2 · cb608f2
1 parent 5bd2400
commit cb608f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/ChemDraw/Classes/DrawView.h b/ChemDraw/Classes/DrawView.h
@@ -62,6 +62,9 @@
 
 -(void) onTimer;
 
+@property (nonatomic, retain) NSTimer *symbolTimer;
 
 
 @end
+
+
diff --git a/ChemDraw/Classes/DrawView.m b/ChemDraw/Classes/DrawView.m
@@ -21,6 +21,7 @@
 
 @implementation DrawView
 
+@synthesize symbolTimer;
 
 // this init method never seems to really get called
 - (id)initWithFrame:(CGRect)frame {
@@ -280,9 +281,8 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
 
 	if([programState currentState] == GESTURE_MODE) {
-		if([symbolTimer isValid] == NO) {
-			symbolTimer = [NSTimer scheduledTimerWithTimeInterval:0.80 target:self selector:@selector(onTimer) userInfo:nil repeats:YES];
-		}
+		NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:0.80 target:self selector:@selector(onTimer) userInfo:nil repeats:YES];
+		[self setSymbolTimer:timer];
 	}
 
 
@@ -361,6 +361,7 @@ - (void) setupToolbarButtonArrays {
 
 }
 
+
 - (void) renderPoint:(CGPoint)point withContext:(CGContextRef)ctx {	
 
 	CGContextSetRGBFillColor(ctx, 0, 255, 0, 1.0);
@@ -386,6 +387,9 @@ -(void) onTimer {
 //	[programState setCurrentState:DEBUG_MODE];
 	[programState setCurrentState:SELECT_OBJECT];
 	[symbolTimer invalidate];
+	[self setSymbolTimer:NULL];
+
+	[gesturePoints clearPoints];
 	[self setNeedsDisplay]; // redraw entire screen
 
 

diff --git a/ChemDraw/Classes/PointObjectMap.h b/ChemDraw/Classes/PointObjectMap.h
@@ -19,6 +19,7 @@
 	NSMutableArray *compressedPointObjects;
 }
 
+- (void) clearPoints;
 - (void) addPoint:(PointObject *)pointObject;
 
 - (void) renderWithContext:(CGContextRef)ctx;

diff --git a/ChemDraw/Classes/PointObjectMap.m b/ChemDraw/Classes/PointObjectMap.m
@@ -36,9 +36,14 @@ - (PointObjectMap *) init {
 
 }
 
+- (void) clearPoints {
+	[pointObjects removeAllObjects];
+	[completePointSet removeAllObjects];
+	[compressedPointObjects removeAllObjects];
+}
+
 - (void) addPoint:(PointObject *)pointObject {
 	[pointObjects addObject:pointObject];
-
 }
 
 - (CGPoint) northPoint {
@@ -133,7 +138,7 @@ - (CGFloat) xDistance {
 // removes any points that are identical
 // then we are ready for the symbolic binary field comparison
 - (CharacterMatch *) compressPoints {
-
+		
 	float shiftFromXOrigin = [self westPoint].x;
 	float shiftFromYOrigin = [self northPoint].y;