[chronojump] Done videos for all tests

[Xavier de Blas <xaviblas src gnome org>]

commit 31db3575a1fb4d501ca601a024e67fbc4bbfa244
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 8 12:26:50 2011 +0100

    Done videos for all tests

 src/constants.cs        |    5 +++--
 src/gui/chronojump.cs   |   28 ++++++++++++++++++++++++++--
 src/gui/eventExecute.cs |   14 +++-----------
 src/util.cs             |   13 +++++++++++++
 4 files changed, 45 insertions(+), 15 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index 6071839..e099ca1 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -477,7 +477,8 @@ public class Constants
 	public const string ExtensionPhoto = ".jpg";
 	public const string SmallPhotoDir = "small";
 	public static string MultimediaFileNoExists = Catalog.GetString("Sorry, this multimedia file does not exists.");
-	public static string PhotoTemp = "chronojump-photo";
-	public static string PhotoSmallTemp = "chronojump-photo-small";
+	public static string PhotoTemp = "chronojump-last-photo";
+	public static string PhotoSmallTemp = "chronojump-last-photo-small";
+	public static string VideoTemp = "chronojump-last-video";
 	
 }
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index ad7194f..bb33d4a 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2030,9 +2030,9 @@ public class ChronoJumpWindow
 			//when adding new person, photos cannot be recorded as currentPerson.UniqueID
 			//because it was undefined. Copy them now
 			if(File.Exists(Util.GetPhotoTempFileName(false)) && File.Exists(Util.GetPhotoTempFileName(true))) {
-				File.Copy(Util.GetPhotoTempFileName(false), 
+				File.Move(Util.GetPhotoTempFileName(false), 
 						Util.GetPhotoFileName(false, currentPerson.UniqueID));
-				File.Copy(Util.GetPhotoTempFileName(true), 
+				File.Move(Util.GetPhotoTempFileName(true), 
 						Util.GetPhotoFileName(true, currentPerson.UniqueID));
 			}
 			
@@ -2930,6 +2930,9 @@ Console.WriteLine("X");
 		if ( ! currentEventExecute.Cancel ) {
 			currentJump = (Jump) currentEventExecute.EventDone;
 
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP, currentJump.UniqueID);
+
 			if(weightPercentPreferred)
 				myTreeViewJumps.Add(currentPerson.Name, currentJump);
 			else {
@@ -3127,6 +3130,9 @@ Console.WriteLine("X");
 		
 		if ( ! currentEventExecute.Cancel ) {
 			currentJumpRj = (JumpRj) currentEventExecute.EventDone;
+			
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP_RJ, currentJumpRj.UniqueID);
 
 			//if user clicked in finish earlier
 			if(currentEventExecute.Finish) {
@@ -3354,6 +3360,10 @@ Console.WriteLine("X");
 		
 		if ( ! currentEventExecute.Cancel ) {
 			currentRun = (Run) currentEventExecute.EventDone;
+			
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN, currentRun.UniqueID);
+			
 			currentRun.MetersSecondsPreferred = metersSecondsPreferred;
 
 			myTreeViewRuns.Add(currentPerson.Name, currentRun);
@@ -3551,6 +3561,10 @@ Console.WriteLine("X");
 		
 		if ( ! currentEventExecute.Cancel ) {
 			currentRunInterval = (RunInterval) currentEventExecute.EventDone;
+
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN_I, currentRunInterval.UniqueID);
+
 			currentRunInterval.MetersSecondsPreferred = metersSecondsPreferred;
 
 			//if user clicked in finish earlier
@@ -3674,6 +3688,9 @@ Console.WriteLine("X");
 
 			currentReactionTime = (ReactionTime) currentEventExecute.EventDone;
 			
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RT, currentReactionTime.UniqueID);
+			
 			myTreeViewReactionTimes.Add(currentPerson.Name, currentReactionTime);
 			
 			//since 0.7.4.1 when test is done, treeview select it. action event button have to be shown 
@@ -3835,6 +3852,9 @@ Console.WriteLine("X");
 			*/
 			
 			currentPulse = (Pulse) currentEventExecute.EventDone;
+			
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.PULSE, currentPulse.UniqueID);
 
 			myTreeViewPulses.Add(currentPerson.Name, currentPulse);
 			
@@ -4023,6 +4043,10 @@ Console.WriteLine("U");
 Console.WriteLine("V");
 			currentMultiChronopic = (MultiChronopic) currentEventExecute.EventDone;
 Console.WriteLine("W");
+			//move video file if exists
+			Util.MoveTempVideo(currentSession.UniqueID, 
+					Constants.TestTypes.MULTICHRONOPIC, currentMultiChronopic.UniqueID);
+
 			//this produces also a crash:
 			//new DialogMessage(Constants.MessageTypes.INFO, "Please, touch a platform now.");
 
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 0c19d24..a2e7864 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -525,15 +525,7 @@ public class EventExecuteWindow
 		capturer = new CapturerBin();
 		CapturePropertiesStruct s = new CapturePropertiesStruct();
 
-		/*
-		Util.CreateVideoSessionDirIfNeeded(sessionID);
-		s.OutputFile = Util.GetVideoFileName(
-			sessionID, //sessionID
-			Constants.TestTypes.JUMP,
-			123 //jump uniqueID
-			);
-		*/
-		s.OutputFile = "/tmp/test.avi";
+		s.OutputFile = Util.GetVideoTempFileName();
 
 		s.VideoBitrate =  1000;
 		s.CaptureSourceType = CaptureSourceType.Raw;
@@ -1770,6 +1762,8 @@ public class EventExecuteWindow
 		eventHasEnded = true;
 		
 		capturer.Stop();
+		capturer.Close();
+		capturer.Dispose();
 	}
 	
 	
@@ -1925,8 +1919,6 @@ public class EventExecuteWindow
 		
 	void on_button_close_clicked (object o, EventArgs args)
 	{
-		capturer.Close();
-		capturer.Dispose();
 		//capturerWindow.Hide();
 
 		EventExecuteWindowBox.event_execute.Hide();
diff --git a/src/util.cs b/src/util.cs
index 9166e39..0f035ec 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -744,6 +744,12 @@ public class Util
 			GetMultimediaExtension(Constants.MultimediaItems.PHOTO);
 	}
 	
+	public static string GetVideoTempFileName() {
+		return Path.Combine(
+				Path.GetTempPath(), Constants.VideoTemp + 
+				GetMultimediaExtension(Constants.MultimediaItems.VIDEO));
+	}
+	
 	public static string GetPhotoTempFileName(bool small) {
 		string fileName = Constants.PhotoTemp;
 		if(small)
@@ -761,6 +767,13 @@ public class Util
 		else //multimediaItem = Constants.MultimediaItems.PHOTO
 			return Constants.ExtensionPhoto;
 	}
+			
+	public static void MoveTempVideo(int sessionID, Constants.TestTypes type, int uniqueID) {
+		if(File.Exists(GetVideoTempFileName())) {
+			CreateVideoSessionDirIfNeeded(sessionID);
+			File.Move(GetVideoTempFileName(), GetVideoFileName(sessionID, type, uniqueID));
+		}
+	}
 
 
 	/********** end of multimedia paths ************/