chronojump r401 - in trunk: . build/data build/linux src src/execute web

[xaviblas svn gnome org]

Author: xaviblas
Date: Tue Jul 22 14:32:56 2008
New Revision: 401
URL: http://svn.gnome.org/viewvc/chronojump?rev=401&view=rev

Log:
0.7.3.4
fixed "-1" as person in personSessionWeight since 0.7.3.2
doing: 543783 chronojump_mini output file and params (pending to pass parameters to .bat to .prg)


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/version.txt
   trunk/build/linux/chronojump_mini.sh
   trunk/changelog.txt
   trunk/src/chronojump_mini.cs
   trunk/src/execute/event.cs
   trunk/src/person.cs
   trunk/version.txt
   trunk/web/create_web_chronojump.pl

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/version.txt
==============================================================================
--- trunk/build/data/version.txt	(original)
+++ trunk/build/data/version.txt	Tue Jul 22 14:32:56 2008
@@ -1 +1 @@
-0.7.3.3
+0.7.3.4

Modified: trunk/build/linux/chronojump_mini.sh
==============================================================================
--- trunk/build/linux/chronojump_mini.sh	(original)
+++ trunk/build/linux/chronojump_mini.sh	Tue Jul 22 14:32:56 2008
@@ -51,4 +51,5 @@
 echo "---------------"
 echo "3d: call Chronojump"
 cd ../data
-mono chronojump_mini.prg 
+mono chronojump_mini.prg $@
+

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Tue Jul 22 14:32:56 2008
@@ -1,5 +1,11 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+22 jul 2008
+	0.7.3.4
+	fixed "-1" as person in personSessionWeight since 0.7.3.2
+	doing: 543783 chronojump_mini output file and params (pending to pass parameters to .bat to .prg)
+
+
 20 jun 2008
 	0.7.3.3
 	splash on windows (XP) works

Modified: trunk/src/chronojump_mini.cs
==============================================================================
--- trunk/src/chronojump_mini.cs	(original)
+++ trunk/src/chronojump_mini.cs	Tue Jul 22 14:32:56 2008
@@ -13,6 +13,7 @@
 
 using System;
 using System.IO.Ports;
+using System.IO; 	//File && TextWriter
 
 using Mono.Unix;
 
@@ -27,7 +28,7 @@
 	/**********************/
 	/* PROGRAMA PRINCIPAL */
 	/**********************/
-	public static void Main()
+	public static void Main(string[] args)
 	{
 		Chronopic.Plataforma estado_plataforma;
 		Automata estado_automata;
@@ -35,6 +36,11 @@
 		double toff;
 		double ton;
 		bool ok;
+		string portName = "";
+		string fileName = "";
+		TextWriter writer;
+		string defaultFileName = "output.txt"; //always output to a file, but if not specified, output here and rewrite it every chronojump_mini execution
+	       
 
 		System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("es-ES");
 		System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("es-ES");
@@ -42,6 +48,25 @@
 		//connect with catalog.cs for using gettext translation
 		Catalog.Init ("chronojump", "./locale");
 
+		//parameters passing
+		if(args.Length > 2) 
+			printSyntaxAndQuit();
+
+		for( int i = 0; i != args.Length; ++i ) {
+			Console.WriteLine("param[{0}]: {1}", i, args[i]);
+			if(args[i].StartsWith("PORT="))
+				portName = args[i].Substring(5);
+			else if (args[i].StartsWith("FILE="))
+				fileName = args[i].Substring(5);
+			else
+				printSyntaxAndQuit();
+		}
+		
+		//output file stuff
+		fileName = manageFileName(fileName, defaultFileName);
+		writer = File.CreateText(fileName);
+
+		//detection of ports
 		string messageInfo;
 		string messageDetected ="";
 
@@ -71,9 +96,11 @@
 		Console.WriteLine("---------------------------");
 		Console.WriteLine(messageDetected);
 		Console.WriteLine("---------------------------\n");
-		Console.WriteLine(Catalog.GetString("Print the port name where chronopic is connected:"));
 
-		string portName=Console.ReadLine();
+		if(portName == "") {
+			Console.WriteLine(Catalog.GetString("Print the port name where chronopic is connected:"));
+			portName=Console.ReadLine();
+		}
 
 		Console.WriteLine(Catalog.GetString("Opening port... if get hanged, generate events with chronopic or the platform"));
 		//-- Crear puerto serie		
@@ -153,6 +180,7 @@
 
 						//-- Imprimir informacion
 						Console.WriteLine(count + " TF: {0:f1} ms",toff);
+						writer.WriteLine(count + " TF: {0:f1} ms",toff);
 					}
 					break;
 
@@ -169,13 +197,91 @@
 
 						//-- Imprimir informacion
 						Console.WriteLine(count + " TC: {0:f1} ms",ton);
+						writer.WriteLine(count + " TC: {0:f1} ms",ton);
 					}
 					break;
 			}
+				
+			writer.Flush();
+
 			count ++;
+		}
 
+	}
+
+	static void printSyntaxAndQuit() {
+		Console.WriteLine(Catalog.GetString("Invalid args. Use:"));
+
+		if(Util.IsWindows()) {
+			Console.WriteLine("chronojump_mini.bat [PORT=portName>] [FILE=outputFile]");
+			Console.WriteLine(Catalog.GetString("Examples:"));
+			Console.WriteLine("chronojump_mini.bat");
+			Console.WriteLine("chronojump_mini.bat PORT=COM1");
+			Console.WriteLine("chronojump_mini.bat FILE=myFile.csv]");
+			Console.WriteLine("chronojump_mini.bat PORT=COM1 FILE=myFile.csv]");
+		} else {
+			Console.WriteLine("./chronojump_mini.sh [PORT=portName>] [-FILE=outputFile]");
+			Console.WriteLine(Catalog.GetString("Examples:"));
+			Console.WriteLine("./chronojump_mini.sh");
+			Console.WriteLine("./chronojump_mini.sh PORT=/dev/ttyS0");
+			Console.WriteLine("./chronojump_mini.sh FILE=myFile.csv]");
+			Console.WriteLine("./chronojump_mini.sh PORT=/dev/ttyUSB0 FILE=myFile.csv]");
 		}
+			
+		Environment.Exit(1);
+	}
+
+	static string manageFileName(string fileName, string defaultFileName) {
+		bool fileOk = false;
+		do {
+			if(fileName == "") 
+				fileName = getFileName();
+
+			//user don't want to print to a file
+			if(fileName == "")
+				fileOk = true;
+			else {
+				if (File.Exists(fileName)) {
+					bool overwrite = askOverwrite(fileName);
+					if(overwrite) 
+						fileOk = true; //overwrite file, is ok
+					else {
+						fileOk = false; //no overwrite, ! ok
+						fileName = ""; //to be asked for fileName again
+					}
+				} else
+					fileOk = true; //file don't exist, is ok
+			}
+		} while(! fileOk);
+
+		if(fileName == "") 
+			fileName = defaultFileName;
+
+		return fileName;
+	}
+
+	static string getFileName() {
+		string fileName = "";
+		Console.WriteLine(Catalog.GetString("Do you want to output data to a file?") + " [y/n]");
+		string option=Console.ReadLine();
+		if(option == "Y" || option == "y") {
+			Console.WriteLine(Catalog.GetString("Please, write filename:"));
+			fileName=Console.ReadLine();
+		}
+		//if 'n' then "" will be returned
+
+		return fileName;
+	}
 
+	static bool askOverwrite(string fileName) {
+		Console.WriteLine(string.Format(Catalog.GetString("File {0} exists with attributes {1}, created at {2}"), 
+					fileName, File.GetAttributes(fileName), File.GetCreationTime(fileName)));
+		Console.WriteLine(string.Format(Catalog.GetString("Are you sure you want to overwrite file: {0}"), fileName) + " [y/n]");
+		string option=Console.ReadLine();
+		if(option == "Y" || option == "y") 
+			return true;
+		else 
+			return false;
 	}
 
 }

Modified: trunk/src/execute/event.cs
==============================================================================
--- trunk/src/execute/event.cs	(original)
+++ trunk/src/execute/event.cs	Tue Jul 22 14:32:56 2008
@@ -110,7 +110,7 @@
 
 	//cancel doesn't finish until platform is touched (after pressing cancel button)
 	//this variable controls that platform has been touched
-	//if not, it will shown a popup from chronojump.cs (on_cancel_clicked)	
+	//if not, it will shown a popup from gui/chronojump.cs (on_cancel_clicked)	
 	protected bool totallyCancelled;
 
 	//for finishing earlier from chronojump.cs

Modified: trunk/src/person.cs
==============================================================================
--- trunk/src/person.cs	(original)
+++ trunk/src/person.cs	Tue Jul 22 14:32:56 2008
@@ -95,8 +95,13 @@
 				Constants.PersonTable, null, name, sex, dateBorn, height, weight, 
 				sportID, speciallityID, practice, description, race, countryID, serverUniqueID);
 		*/
+
+		//when insert as person we don't know uniqueID
 		uniqueID = -1;
-		this.InsertAtDB(false, Constants.PersonTable);
+		int insertedID = this.InsertAtDB(false, Constants.PersonTable);
+
+		//we need uniqueID for personSession
+		uniqueID = insertedID;
 
 		Log.WriteLine(this.ToString());
 
@@ -122,13 +127,14 @@
 		this.serverUniqueID = Convert.ToInt32(myString[12]); //remember don't do this on server
 	}
 
-	public void InsertAtDB (bool dbconOpened, string tableName) {
-		SqlitePerson.Insert(dbconOpened, tableName, 
+	public int InsertAtDB (bool dbconOpened, string tableName) {
+		int myID = SqlitePerson.Insert(dbconOpened, tableName, 
 				uniqueID.ToString(), name,
 				sex, dateBorn, height, -1, //person weight is '-1', weight is in personSessionWeight table
 				sportID, speciallityID, practice,
 				description, race, countryID,
 				serverUniqueID);
+		return myID;
 	}
 	
 

Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt	(original)
+++ trunk/version.txt	Tue Jul 22 14:32:56 2008
@@ -1 +1 @@
-0.7.3.3
+0.7.3.4

Modified: trunk/web/create_web_chronojump.pl
==============================================================================
--- trunk/web/create_web_chronojump.pl	(original)
+++ trunk/web/create_web_chronojump.pl	Tue Jul 22 14:32:56 2008
@@ -40,12 +40,12 @@
 
 my $awards .= "http://tropheesdulibre.org";;
 
-my $construccio_dispositius_mesuraLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/construccio_dispositius_mesura.avi";;
+my $construccio_dispositius_mesuraLink = "http://www.vimeo.com/1205809";;
 my $fonaments_teorics_bescos_velezLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/fonaments_teorics-bescos-velez.avi";;
 my $fonaments_teorics_padullesLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/fonaments_teorics-padulles.avi";;
 my $homenatge_carmelo_boscoLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/homenatge_carmelo_bosco.avi";;
 my $instalacio_construccio_adquisicioLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/instalacio_construccio_adquisicio.avi";;
-my $projecte_chronojumpLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/projecte_chronojump.avi";;
+my $projecte_chronojumpLink = "http://www.vimeo.com/1198489";;
 my $us_chronojump_bescos_padullesLink = "http://ftp.gnome.org/pub/GNOME/teams/chronojump/us_chronojump-bescos-padulles.avi";;