[Bibdesk-commit] SF.net SVN: bibdesk: [8214] trunk/bibdesk

[<ama...@us...>]

Revision: 8214
          http://svn.sourceforge.net/bibdesk/?rev=8214&view=rev
Author:   amaxwell
Date:     2006-10-29 19:49:28 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
Rename methods to reflect CIFilter parameters, make sure that -finalImage doesn't interfere with the filter's state.

Modified Paths:
--------------
    trunk/bibdesk/BDSKImageFadeAnimation.h
    trunk/bibdesk/BDSKImageFadeAnimation.m
    trunk/bibdesk/BDSKImagePopUpButton.m

Modified: trunk/bibdesk/BDSKImageFadeAnimation.h
===================================================================
--- trunk/bibdesk/BDSKImageFadeAnimation.h	2006-10-30 01:01:42 UTC (rev 8213)
+++ trunk/bibdesk/BDSKImageFadeAnimation.h	2006-10-30 03:49:28 UTC (rev 8214)
@@ -45,12 +45,14 @@
     CIFilter *filter;
 }
 
-// final image, after transition is complete
-- (void)setFinalImage:(NSImage *)anImage;
+// set the final image, after transition is complete
+- (void)setTargetImage:(NSImage *)anImage;
+// use to set the starting point for the animation
+- (void)setStartingImage:(NSImage *)anImage;
+
+// returns the image at the final time value
 - (NSImage *)finalImage;
-
-// use to set the starting point for the animation
-- (void)setCurrentImage:(NSImage *)anImage;
+// returns the image at the current time value
 - (NSImage *)currentImage;
 
 @end

Modified: trunk/bibdesk/BDSKImageFadeAnimation.m
===================================================================
--- trunk/bibdesk/BDSKImageFadeAnimation.m	2006-10-30 01:01:42 UTC (rev 8213)
+++ trunk/bibdesk/BDSKImageFadeAnimation.m	2006-10-30 03:49:28 UTC (rev 8214)
@@ -73,20 +73,26 @@
     [[self delegate] imageAnimationDidUpdate:self];
 }
 
-- (void)setCurrentImage:(NSImage *)anImage;
+- (void)setStartingImage:(NSImage *)anImage;
 {
     [filter setValue:[CIImage imageWithData:[anImage TIFFRepresentation]] forKey:@"inputImage"];
 }
 
-- (void)setFinalImage:(NSImage *)anImage;
+- (void)setTargetImage:(NSImage *)anImage;
 {
     [filter setValue:[CIImage imageWithData:[anImage TIFFRepresentation]] forKey:@"inputTargetImage"];
 }
 
 - (NSImage *)finalImage;
 {
+    NSNumber *inputTime = [filter valueForKey:@"inputTime"];
+    
     [filter setValue:[NSNumber numberWithInt:1] forKey:@"inputTime"];
-    return [self currentImage]; 
+    NSImage *currentImage = [self currentImage];
+    
+    // restore the input time, since calling -finalImage shouldn't interrupt the animation
+    [filter setValue:inputTime forKey:@"inputTime"];
+    return currentImage;
 }
 
 - (NSImage *)currentImage;

Modified: trunk/bibdesk/BDSKImagePopUpButton.m
===================================================================
--- trunk/bibdesk/BDSKImagePopUpButton.m	2006-10-30 01:01:42 UTC (rev 8213)
+++ trunk/bibdesk/BDSKImagePopUpButton.m	2006-10-30 03:49:28 UTC (rev 8214)
@@ -146,8 +146,8 @@
     NSImage *iconImage = [self iconImage];
     
     if (nil != iconImage && nil != newImage) {
-        [animation setFinalImage:newImage];
-        [animation setCurrentImage:iconImage];
+        [animation setTargetImage:newImage];
+        [animation setStartingImage:iconImage];
         [animation startAnimation];
     } else {
         [self setIconImage:newImage];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.