chronojump r405 - in trunk: . build/data src

[xaviblas svn gnome org]

Author: xaviblas
Date: Sun Jul 27 01:05:51 2008
New Revision: 405
URL: http://svn.gnome.org/viewvc/chronojump?rev=405&view=rev

Log:
chronojump_mini exports now to windows or linux folder (not data)


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/version.txt
   trunk/changelog.txt
   trunk/src/chronojump_mini.cs

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	Sun Jul 27 01:05:51 2008
@@ -1 +1 @@
-0.7.3.5
+0.7.4

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Sun Jul 27 01:05:51 2008
@@ -1,5 +1,8 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+27 jul 2008 (2)
+	chronojump_mini exports now to windows or linux folder (not data)
+
 27 jul 2008
 	0.7.4
 	chronojump_mini prints data suitable to be on a csv (separated by ';')

Modified: trunk/src/chronojump_mini.cs
==============================================================================
--- trunk/src/chronojump_mini.cs	(original)
+++ trunk/src/chronojump_mini.cs	Sun Jul 27 01:05:51 2008
@@ -57,8 +57,11 @@
 				Console.WriteLine("param[{0}]: {1}", i, args[i]);
 				if(args[i].StartsWith("PORT="))
 					portName = args[i].Substring(5);
-				else if (args[i].StartsWith("FILE="))
+				else if (args[i].StartsWith("FILE=")) {
 					fileName = args[i].Substring(5);
+					//put file in windows or linux folder (instead of data folder)
+					fileName=".." + Path.DirectorySeparatorChar + getOutputDir() + Path.DirectorySeparatorChar + fileName;
+				}
 				else
 					printSyntaxAndQuit();
 			}
@@ -229,7 +232,7 @@
 			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("./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");
@@ -269,15 +272,26 @@
 		return fileName;
 	}
 
+	static string getOutputDir() {
+		string dir = "linux";
+		if(Util.IsWindows())
+			dir = "windows";
+		return dir;
+	}
+
 	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("If you want to open it with an Spreadsheet like Gnumeric, OpenOffice or MS Office, we recomend to use .csv extension.\neg: 'test.csv'"));
-			Console.WriteLine(string.Format(Catalog.GetString("File will be available at directory: {0}"), Path.GetFullPath(".." + Path.DirectorySeparatorChar + "data")));
+			Console.WriteLine(string.Format(Catalog.GetString("File will be available at directory: {0}"), Path.GetFullPath(".." + Path.DirectorySeparatorChar + getOutputDir())));
 			Console.WriteLine(Catalog.GetString("Please, write filename:"));
 			fileName=Console.ReadLine();
+
+			//put file in windows or linux folder (instead of data folder)
+			fileName=".." + Path.DirectorySeparatorChar + getOutputDir() + Path.DirectorySeparatorChar + fileName;
 		}
 		//if 'n' then "" will be returned