chronojump r447 - in trunk: . build/data chronojump_server chronojump_server/bin glade images images/mini src src/execute src/gui src/sqlite src/stats src/stats/graphs
- From: xaviblas svn gnome org
- To: svn-commits-list gnome org
- Subject: chronojump r447 - in trunk: . build/data chronojump_server chronojump_server/bin glade images images/mini src src/execute src/gui src/sqlite src/stats src/stats/graphs
- Date: Fri, 30 Jan 2009 20:27:53 +0000 (UTC)
Author: xaviblas
Date: Fri Jan 30 20:27:53 2009
New Revision: 447
URL: http://svn.gnome.org/viewvc/chronojump?rev=447&view=rev
Log:
30 jan 2009
0.8.1.6
user created testsTypes DONE but not working yet!
db 0.62
Added rj hexagon test
stats now select also all tests
recorded ip in SPing
Added missing: chronojump_server/chronojumpServerCSharp.cs
deleted xdeblas.com and deporteyciencia.com on all files
Added:
trunk/chronojump_server/chronojumpServerCSharp.cs (contents, props changed)
Removed:
trunk/images/agility_hexagon.png
trunk/images/mini/agility_hexagon.png
Modified:
trunk/Makefile
trunk/build/data/chronojump.prg
trunk/build/data/chronojump_mini.prg
trunk/build/data/version.txt
trunk/changelog.txt
trunk/chronojump_server/ChronojumpServer.cs
trunk/chronojump_server/bin/chronojumpServer.dll
trunk/chronojump_server/compile_wsdl.sh
trunk/glade/chronojump.glade
trunk/src/chronojump.cs
trunk/src/constants.cs
trunk/src/event.cs
trunk/src/eventType.cs
trunk/src/execute/event.cs
trunk/src/execute/jump.cs
trunk/src/execute/pulse.cs
trunk/src/execute/reactionTime.cs
trunk/src/execute/run.cs
trunk/src/exportSession.cs
trunk/src/gui/about.cs
trunk/src/gui/chronojump.cs
trunk/src/gui/chronopicConnection.cs
trunk/src/gui/confirm.cs
trunk/src/gui/convertWeight.cs
trunk/src/gui/dialogCalendar.cs
trunk/src/gui/dialogImageTest.cs
trunk/src/gui/dialogMessage.cs
trunk/src/gui/error.cs
trunk/src/gui/event.cs
trunk/src/gui/eventExecute.cs
trunk/src/gui/eventGraphConfigure.cs
trunk/src/gui/genericWindow.cs
trunk/src/gui/helpPorts.cs
trunk/src/gui/jump.cs
trunk/src/gui/jumpType.cs
trunk/src/gui/language.cs
trunk/src/gui/person.cs
trunk/src/gui/preferences.cs
trunk/src/gui/pulse.cs
trunk/src/gui/reactionTime.cs
trunk/src/gui/repetitiveConditions.cs
trunk/src/gui/report.cs
trunk/src/gui/run.cs
trunk/src/gui/runType.cs
trunk/src/gui/server.cs
trunk/src/gui/session.cs
trunk/src/gui/splash.cs
trunk/src/gui/stats.cs
trunk/src/jump.cs
trunk/src/jumpType.cs
trunk/src/log.cs
trunk/src/person.cs
trunk/src/platform.cs
trunk/src/prepareEventGraphObjects.cs
trunk/src/pulse.cs
trunk/src/pulseType.cs
trunk/src/reactionTime.cs
trunk/src/reactionTimeType.cs
trunk/src/report.cs
trunk/src/run.cs
trunk/src/runType.cs
trunk/src/server.cs
trunk/src/serverEvaluator.cs
trunk/src/serverPing.cs
trunk/src/session.cs
trunk/src/sport.cs
trunk/src/sqlite/country.cs
trunk/src/sqlite/event.cs
trunk/src/sqlite/jump.cs
trunk/src/sqlite/jumpRj.cs
trunk/src/sqlite/jumpType.cs
trunk/src/sqlite/main.cs
trunk/src/sqlite/person.cs
trunk/src/sqlite/personSession.cs
trunk/src/sqlite/preferences.cs
trunk/src/sqlite/pulse.cs
trunk/src/sqlite/pulseType.cs
trunk/src/sqlite/reactionTime.cs
trunk/src/sqlite/run.cs
trunk/src/sqlite/runInterval.cs
trunk/src/sqlite/runType.cs
trunk/src/sqlite/server.cs
trunk/src/sqlite/session.cs
trunk/src/sqlite/speciallity.cs
trunk/src/sqlite/sport.cs
trunk/src/sqlite/stat.cs
trunk/src/statType.cs
trunk/src/stats/djIndex.cs
trunk/src/stats/djQ.cs
trunk/src/stats/fv.cs
trunk/src/stats/global.cs
trunk/src/stats/graphs/djIndex.cs
trunk/src/stats/graphs/djQ.cs
trunk/src/stats/graphs/fv.cs
trunk/src/stats/graphs/global.cs
trunk/src/stats/graphs/graphData.cs
trunk/src/stats/graphs/graphSerie.cs
trunk/src/stats/graphs/ieIub.cs
trunk/src/stats/graphs/potency.cs
trunk/src/stats/graphs/rjAVGSD.cs
trunk/src/stats/graphs/rjEvolution.cs
trunk/src/stats/graphs/rjIndex.cs
trunk/src/stats/graphs/rjPotencyBosco.cs
trunk/src/stats/graphs/sjCmjAbk.cs
trunk/src/stats/graphs/sjCmjAbkPlus.cs
trunk/src/stats/ieIub.cs
trunk/src/stats/main.cs
trunk/src/stats/potency.cs
trunk/src/stats/rjAVGSD.cs
trunk/src/stats/rjEvolution.cs
trunk/src/stats/rjIndex.cs
trunk/src/stats/rjPotencyBosco.cs
trunk/src/stats/sjCmjAbk.cs
trunk/src/stats/sjCmjAbkPlus.cs
trunk/src/treeViewEvent.cs
trunk/src/treeViewJump.cs
trunk/src/treeViewPerson.cs
trunk/src/treeViewPulse.cs
trunk/src/treeViewReactionTime.cs
trunk/src/treeViewRun.cs
trunk/src/updateProgressBar.cs
trunk/src/util.cs
trunk/src/utilGtk.cs
trunk/version.txt
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jan 30 20:27:53 2009
@@ -52,7 +52,6 @@
RESOURCES_IMAGES = -resource:images/mini/no_image.png,mini/no_image.png \
-resource:images/agility_505.png,agility_505.png -resource:images/mini/agility_505.png,mini/agility_505.png \
-resource:images/agility_20yard.png,agility_20yard.png -resource:images/mini/agility_20yard.png,mini/agility_20yard.png \
- -resource:images/agility_hexagon.png,agility_hexagon.png -resource:images/mini/agility_hexagon.png,mini/agility_hexagon.png \
-resource:images/agility_illinois.png,agility_illinois.png -resource:images/mini/agility_illinois.png,mini/agility_illinois.png \
-resource:images/agility_shuttle.png,agility_shuttle.png -resource:images/mini/agility_shuttle.png,mini/agility_shuttle.png \
-resource:images/agility_zigzag.png,agility_zigzag.png -resource:images/mini/agility_zigzag.png,mini/agility_zigzag.png \
@@ -67,6 +66,7 @@
-resource:images/jump_rocket.png,jump_rocket.png -resource:images/mini/jump_rocket.png,mini/jump_rocket.png \
-resource:images/jump_rj.png,jump_rj.png -resource:images/mini/jump_rj.png,mini/jump_rj.png \
-resource:images/jump_rj_in.png,jump_rj_in.png -resource:images/mini/jump_rj_in.png,mini/jump_rj_in.png \
+ -resource:images/jump_rj_hexagon.png,jump_rj_hexagon.png -resource:images/mini/jump_rj_hexagon.png,mini/jump_rj_hexagon.png \
-resource:images/run_simple.png,run_simple.png -resource:images/mini/run_simple.png,mini/run_simple.png \
-resource:images/run_interval.png,run_interval.png -resource:images/mini/run_interval.png,mini/run_interval.png \
-resource:images/pulse_free.png,pulse_free.png -resource:images/mini/pulse_free.png,mini/pulse_free.png \
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 Fri Jan 30 20:27:53 2009
@@ -1 +1 @@
-0.8.1.4
+0.8.1.6
Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt (original)
+++ trunk/changelog.txt Fri Jan 30 20:27:53 2009
@@ -11,17 +11,11 @@
5.- do something with user created:
-sports DONE!
--testsTypes
-+jumpType done
+-testsTypes DONE but not tested... not working yet!
+...
-
-Add hexagon test
-
Add Cabedo's tests
-record ip in SPing
-
add "chronopic3" to ping. maybe need to ask to user
add a link to the server page
@@ -32,6 +26,19 @@
all this will be release as 0.8.2 or 0.9
+
+30 jan 2009
+ 0.8.1.6
+ user created testsTypes DONE but not working yet!
+ db 0.62
+ Added rj hexagon test
+
+ stats now select also all tests
+ recorded ip in SPing
+
+ Added missing: chronojump_server/chronojumpServerCSharp.cs
+ deleted xdeblas.com and deporteyciencia.com on all files
+
29 jan 2009 (2)
as below but cleaning server code in src/gui/chronojump.cs
Modified: trunk/chronojump_server/ChronojumpServer.cs
==============================================================================
--- trunk/chronojump_server/ChronojumpServer.cs (original)
+++ trunk/chronojump_server/ChronojumpServer.cs Fri Jan 30 20:27:53 2009
@@ -147,22 +147,22 @@
}
/// <remarks>
-///Upload a jump type (user defined)
+///Upload a test type (user defined)
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://localhost:8080/UploadJumpType";, RequestNamespace="http://localhost:8080/";, ResponseNamespace="http://localhost:8080/";, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
- public string UploadJumpType(JumpType type, int evalSID) {
- object[] results = this.Invoke("UploadJumpType", new object[] {
- type, evalSID});
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://localhost:8080/UploadTestType";, RequestNamespace="http://localhost:8080/";, ResponseNamespace="http://localhost:8080/";, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
+ public string UploadTestType(Constants.TestTypes testType, EventType type, int evalSID) {
+ object[] results = this.Invoke("UploadTestType", new object[] {
+ testType, type, evalSID});
return ((string)(results[0]));
}
- public System.IAsyncResult BeginUploadJumpType(JumpType type, int evalSID, System.AsyncCallback callback, object asyncState) {
- return this.BeginInvoke("UploadJumpType", new object[] {
- type, evalSID}, callback, asyncState);
+ public System.IAsyncResult BeginUploadTestType(Constants.TestTypes testType, EventType type, int evalSID, System.AsyncCallback callback, object asyncState) {
+ return this.BeginInvoke("UploadTestType", new object[] {
+ testType, type, evalSID}, callback, asyncState);
}
- public string EndUploadJumpType(System.IAsyncResult asyncResult) {
+ public string EndUploadTestType(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((string)(results[0]));
}
@@ -274,6 +274,7 @@
return ((int)(results[0]));
}
+ /*
/// <remarks>
///Upload a jump
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
@@ -295,6 +296,7 @@
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
+ */
/// <remarks>
///Upload a jumpRj
@@ -362,6 +364,7 @@
return ((int)(results[0]));
}
+ /*
/// <remarks>
///Upload a reaction time
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
@@ -405,6 +408,7 @@
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
+ */
/// <remarks>
///List directory files (only as a sample)
@@ -471,6 +475,8 @@
return ((int)(results[0]));
}
*/
+
+ /*
/// <remarks>
///hola3
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
@@ -491,6 +497,8 @@
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
+ */
+
/*
/// <remarks>
///hola4
@@ -520,15 +528,15 @@
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://localhost:8080/Hola5";, RequestNamespace="http://localhost:8080/";, ResponseNamespace="http://localhost:8080/";, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
- public int Hola5(string text, Event jump, bool reactive) {
+ public int Hola5(string text, Event myTest, Constants.TestTypes type) {
object[] results = this.Invoke("Hola5", new object[] {
- text, jump, reactive});
+ text, myTest, type});
return ((int)(results[0]));
}
- public System.IAsyncResult BeginHola5(string text, Event jump, bool reactive, System.AsyncCallback callback, object asyncState) {
+ public System.IAsyncResult BeginHola5(string text, Event myTest, Constants.TestTypes type, System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("Hola5", new object[] {
- text, jump, reactive}, callback, asyncState);
+ text, myTest, type}, callback, asyncState);
}
public int EndHola5(System.IAsyncResult asyncResult) {
Modified: trunk/chronojump_server/bin/chronojumpServer.dll
==============================================================================
Binary files. No diff available.
Added: trunk/chronojump_server/chronojumpServerCSharp.cs
==============================================================================
--- (empty file)
+++ trunk/chronojump_server/chronojumpServerCSharp.cs Fri Jan 30 20:27:53 2009
@@ -0,0 +1,470 @@
+//llibre mono (notebook) pag 206
+
+using System; //for environment
+using System.IO;
+using System.Web.Services;
+//using System.Web;
+
+using System.Collections; //ArrayList
+
+//[WebService(Namespace="http://80.32.81.197:8080/";, //works to connect with pinux xen from client (from browser don't works)
+[WebService(Namespace="http://localhost:8080/";, //work to connect to corall development from client (from browser works only when online)
+ Description="ChronojumpServer")]
+public class ChronojumpServer {
+
+ [WebMethod(Description="Conecta BBDD")]
+ public string ConnectDatabase()
+ {
+ try {
+ Sqlite.ConnectServer();
+ return "Connected";
+ } catch {
+ return "Unnable to connect";
+ }
+ }
+
+ [WebMethod(Description="Desconecta BBDD")]
+ public string DisConnectDatabase()
+ {
+ try {
+ Sqlite.DisConnect();
+ return "Disconnected";
+ } catch {
+ return "Unnable to disconnect";
+ }
+ }
+
+ [WebMethod(Description="Stats")]
+ public ArrayList Stats()
+ {
+ ArrayList stats = SqliteServer.Stats();
+
+ return stats;
+ }
+
+ [WebMethod(Description="Upload a session")]
+ public int UploadSession(ServerSession mySession)
+ {
+ Console.WriteLine(mySession.ToString());
+
+ int id = mySession.InsertAtDB(false, Constants.SessionTable);
+
+ return id; //uniqueID of person at server
+ }
+
+ [WebMethod(Description="Update session uploadingState")]
+ public int UpdateSession(int sessionID, Constants.ServerSessionStates state)
+ {
+ SqliteServerSession.UpdateUploadingState(sessionID, state);
+
+ return 1;
+ }
+
+ [WebMethod(Description="Upload an sport (user defined)")]
+ public int UploadSport(Sport mySport)
+ {
+ int id = -1;
+ //upload if doesn't exists (uploaded before by this or other evaluator)
+ if(! Sqlite.Exists(Constants.SportTable, mySport.Name))
+ id = mySport.InsertAtDB(false);
+
+ return id; //uniqueID of sport at server
+ }
+
+ [WebMethod(Description="Upload a test type (user defined)")]
+ public string UploadTestType(Constants.TestTypes testType, EventType type, int evalSID)
+ {
+ string typeServer = type.Name + "-" + evalSID.ToString();
+
+ /*
+ //upload if doesn't exists (uploaded before by this evaluator)
+ //Console.WriteLine(typeServer + ":" + type.StartIn + ":" + type.HasWeight + ":" + type.Description);
+ if(! Sqlite.Exists(Constants.JumpTypeTable, typeServer)) {
+ //Console.WriteLine("Jump type doesn't exists");
+ SqliteJumpType.JumpTypeInsert(
+ typeServer + ":" + Util.BoolToInt(type.StartIn).ToString() + ":" +
+ Util.BoolToInt(type.HasWeight).ToString() + ":" + type.Description,
+ false);
+ }
+ */
+ Console.WriteLine("XXXXXXXXXXXXXXXX");
+ bool inserted = false;
+ switch (testType) {
+ case Constants.TestTypes.JUMP :
+ JumpType jumpType = (JumpType)type;
+ Console.WriteLine("JUMP" + typeServer + ":" + jumpType.StartIn + ":" + jumpType.HasWeight + ":" + jumpType.Description);
+ if(! Sqlite.Exists(Constants.JumpTypeTable, typeServer)) {
+ Console.WriteLine("YYYYYYYYYYYYYYYY");
+ //Console.WriteLine("Jump type doesn't exists");
+ SqliteJumpType.JumpTypeInsert(
+ typeServer + ":" + Util.BoolToInt(jumpType.StartIn).ToString() + ":" +
+ Util.BoolToInt(jumpType.HasWeight).ToString() + ":" + jumpType.Description,
+ false);
+ inserted = true;
+ }
+ break;
+ case Constants.TestTypes.JUMP_RJ :
+ JumpType jumpTypeRj = (JumpType)type;
+ Console.WriteLine("JUMP_RJ" + typeServer + ":" + jumpTypeRj.Description);
+ if(! Sqlite.Exists(Constants.JumpRjTypeTable, typeServer)) {
+ //Console.WriteLine("JumpRj type doesn't exists");
+ SqliteJumpType.JumpRjTypeInsert(
+ typeServer + ":" + Util.BoolToInt(jumpTypeRj.StartIn).ToString() + ":" +
+ Util.BoolToInt(jumpTypeRj.HasWeight).ToString() + ":" +
+ Util.BoolToInt(jumpTypeRj.JumpsLimited).ToString() + ":" +
+ jumpTypeRj.FixedValue.ToString() + ":" +
+ jumpTypeRj.Description,
+ false);
+ inserted = true;
+ }
+ break;
+ }
+
+ Console.WriteLine("zzzzzzzzzzzzzzzzzzzzzzzz");
+
+ if(inserted)
+ return typeServer;
+ else
+ return "-1";
+ }
+
+
+ [WebMethod(Description="Upload a person")]
+ public int UploadPerson(Person myPerson, int sessionID)
+ {
+ //store person uniqueID
+ int temp = myPerson.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myPerson.UniqueID = -1;
+
+ //do insertion
+ int id = myPerson.InsertAtDB(false, Constants.PersonTable);
+
+ //roll back person unique id value
+ myPerson.UniqueID = temp;
+
+ Console.WriteLine("id at server: " + id);
+
+ return id; //uniqueID of person at server
+ }
+
+ [WebMethod(Description="Upload person session if needed")]
+ public int UploadPersonSessionIfNeeded(int personServerID, int sessionServerID, int weight)
+ {
+ if(!SqlitePersonSession.PersonSelectExistsInSession(personServerID, sessionServerID)) {
+ Console.WriteLine("personSession needed");
+ SqlitePersonSession.Insert (personServerID, sessionServerID, weight);
+ Console.WriteLine("done");
+ return 1; //unused
+ } else
+ Console.WriteLine("personSession NOT needed");
+ return 0; //unused
+ }
+
+ [WebMethod(Description="Upload a ping")]
+ public int UploadPing(ServerPing myPing, bool doInsertion)
+ {
+ //problemes getting user ip:
+ //when it works it should be assigned to myPing.IP
+ //string a = Request.UserHostName;
+ //Console.WriteLine(System.Web.HttpRequest.UserHostAdress);
+
+ Console.WriteLine("ping string: " + myPing.ToString());
+
+ //!doInsertion is a way to know if server is connected
+ //but without inserting nothing
+ //is ok before uploading a session
+
+ if(doInsertion) {
+ int id = myPing.InsertAtDB(false);
+ return id;
+ } else
+ return -1;
+ }
+
+ [WebMethod(Description="Upload a evaluator")]
+ public int UploadEvaluator(ServerEvaluator myEval)
+ {
+ Console.WriteLine("eval string: " + myEval.ToString());
+
+ //do insertion
+ int id = myEval.InsertAtDB(false);
+
+ return id;
+ }
+
+ [WebMethod(Description="Upload an array")]
+ public int UploadArray (ArrayList array)
+ {
+ //funciona
+ //foreach(int num in array)
+ // Console.Write(num.ToString() + "\t");
+ /*
+ //funciona
+ foreach(string str in array)
+ Console.Write(str + "\t");
+ */
+ //funciona
+ foreach(Event myEvent in array)
+ Console.WriteLine(myEvent.Prova() + "\t");
+ //no funciona
+ //foreach(Jump jump in array)
+ // Console.WriteLine(jump.Prova() + "\t");
+
+ return 1;
+ }
+
+ [WebMethod(Description="Upload a test")]
+ public int UploadTest (Event myTest, Constants.TestTypes type, string tableName)
+ {
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = 0;
+ switch (type) {
+ case Constants.TestTypes.JUMP :
+ Jump jump = (Jump)myTest;
+ id = jump.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.JUMP_RJ :
+ JumpRj jumpRj = (JumpRj)myTest;
+ id = jumpRj.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.RUN :
+ Run run = (Run)myTest;
+ id = run.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.RUN_I :
+ RunInterval runI = (RunInterval)myTest;
+ id = runI.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.RT :
+ ReactionTime rt = (ReactionTime)myTest;
+ id = rt.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.PULSE :
+ Pulse pulse = (Pulse)myTest;
+ id = pulse.InsertAtDB(false, tableName);
+ break;
+ }
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id;
+ }
+
+ /*
+ [WebMethod(Description="Upload a jump")]
+ public int UploadJump (Jump myTest)
+ {
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.JumpTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ }
+ */
+
+ [WebMethod(Description="Upload a jumpRj")]
+ public int UploadJumpRj (JumpRj myTest)
+ {
+ /*
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.JumpRjTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ */
+ return 1;
+ }
+
+ [WebMethod(Description="Upload a run")]
+ public int UploadRun (Run myTest)
+ {
+ /*
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.RunTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ */
+
+ return 1;
+ }
+
+
+ [WebMethod(Description="Upload a run interval")]
+ public int UploadRunI (RunInterval myTest)
+ {
+ /*
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.RunIntervalTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ */
+ return 1;
+ }
+
+ /*
+ [WebMethod(Description="Upload a reaction time")]
+ public int UploadRT (ReactionTime myTest)
+ {
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.ReactionTimeTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ }
+
+ [WebMethod(Description="Upload a pulse")]
+ public int UploadPulse (Pulse myTest)
+ {
+ //store event uniqueID
+ int temp = myTest.UniqueID;
+
+ //change value for being inserted with new numeration in server
+ myTest.UniqueID = -1;
+
+ //insert
+ int id = myTest.InsertAtDB(false, Constants.PulseTable);
+
+ //roll back person unique id value
+ myTest.UniqueID = temp;
+
+ return id; //uniqueID of person at server
+ }
+ */
+
+ [WebMethod(Description="hola")]
+ public int Hola(string text, int id) {
+ Console.WriteLine(text + " hola " + id.ToString());
+ return 1;
+ }
+
+ /*
+ [WebMethod(Description="hola2")]
+ public int Hola2(string text, Jump jump) {
+ Console.WriteLine(text + " hola2" + jump.UniqueID.ToString() + " " + jump.Description + "/" + jump.Tv.ToString() );
+ return 1;
+ }
+ */
+
+/*
+ [WebMethod(Description="hola3")]
+ public int Hola3(string text, Event jumpi) {
+ Jump jump2 = (Jump)jumpi;
+ Console.WriteLine(text + " hola3" + jump2.UniqueID.ToString() + " " + jump2.Description + "/" + jump2.Tv.ToString() );
+ return 1;
+ }
+ */
+
+ [WebMethod(Description="hola5")]
+ public int Hola5(string text, Event myTest, Constants.TestTypes type) {
+ switch (type) {
+ case Constants.TestTypes.JUMP :
+ Jump jump = (Jump)myTest;
+ Console.WriteLine(text + " hola5 jump" + jump.UniqueID.ToString() + " " + jump.Description + "/" + jump.Tv.ToString() );
+ break;
+ case Constants.TestTypes.JUMP_RJ :
+ JumpRj jumpRj = (JumpRj)myTest;
+ Console.WriteLine(text + " hola5 jumpRj" + jumpRj.UniqueID.ToString() + " " + jumpRj.Description + "/" + jumpRj.TvString );
+ break;
+ case Constants.TestTypes.RUN :
+ Run run = (Run)myTest;
+ Console.WriteLine(text + " hola5 run" + run.UniqueID.ToString() + " " + run.Description + "/" + run.Time.ToString() );
+ break;
+ case Constants.TestTypes.RUN_I :
+ RunInterval runI = (RunInterval)myTest;
+ Console.WriteLine(text + " hola5 runI" + runI.UniqueID.ToString() + " " + runI.Description + "/" + runI.TimeTotal.ToString() );
+ break;
+ /*
+ case Constants.TestTypes.RT :
+ ReactionTime rt = (ReactionTime)myTest;
+ id = rt.InsertAtDB(false, tableName);
+ break;
+ case Constants.TestTypes.PULSE :
+ Pulse pulse = (Pulse)myTest;
+ id = pulse.InsertAtDB(false, tableName);
+ break;
+ */
+ }
+
+ return 1;
+ }
+
+
+
+ [WebMethod(Description="List directory files (only as a sample)")]
+ public string [] ListDirectory(string path) {
+ return Directory.GetFileSystemEntries(path);
+ }
+
+ /*
+ [WebMethod(Description="Select person name")]
+ public string SelectPersonName(int personID)
+ {
+ return SqlitePerson.SelectJumperName(personID);
+ }
+ */
+
+ /*
+ [WebMethod(Description="See all persons")]
+ public ArrayList SelectAllPersons()
+ {
+ return SqlitePerson.SelectAllPersons();
+ }
+
+ [WebMethod(Description="Select events from all persons")]
+ public ArrayList SelectAllPersonEvents(int personID) {
+ return SqlitePerson.SelectAllPersonEvents(personID);
+ }
+ */
+
+}
Modified: trunk/chronojump_server/compile_wsdl.sh
==============================================================================
--- trunk/chronojump_server/compile_wsdl.sh (original)
+++ trunk/chronojump_server/compile_wsdl.sh Fri Jan 30 20:27:53 2009
@@ -6,5 +6,4 @@
sleep 3
echo compiling wsdl
-wsdl2 http://localhost:8080/chronojumpServer.asmx
-#wsdl2 http://0.0.0.0:8080/chronojumpServer.asmx
+wsdl2 http://localhost:8080/chronojumpServer.asmx
Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade (original)
+++ trunk/glade/chronojump.glade Fri Jan 30 20:27:53 2009
@@ -10757,6 +10757,25 @@
</child>
<child>
+ <widget class="GtkButton" id="button_rj_hexagon">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Reactive Jump unlimited (until finish button is clicked)</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Hexagon</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_rj_activate" last_modification_time="Thu, 23 Sep 2004 00:45:53 GMT"/>
+ <signal name="enter" handler="on_button_enter" last_modification_time="Tue, 01 May 2007 20:08:16 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkAlignment" id="alignment_more_rj">
<property name="visible">True</property>
<property name="xalign">0.5</property>
@@ -22992,6 +23011,69 @@
</child>
<child>
+ <widget class="GtkHBox" id="hbox289">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label_uploaded_test_types">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_uploaded_sports">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkHButtonBox" id="hbuttonbox43">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
Modified: trunk/src/chronojump.cs
==============================================================================
--- trunk/src/chronojump.cs (original)
+++ trunk/src/chronojump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
@@ -114,17 +113,29 @@
ChronojumpServer myServer = new ChronojumpServer();
Jump jump = new Jump();
- jump.UniqueID=777;
+ jump.UniqueID=111;
jump.Description="bon dia";
jump.Tv=919;
jump.HolaServer(myServer);
JumpRj jumpRj = new JumpRj();
- jumpRj.UniqueID=777;
- jumpRj.Description="bon dia";
+ jumpRj.UniqueID=222;
+ jumpRj.Description="bon dia jump";
jumpRj.TvString="el meu tvString";
jumpRj.HolaServer(myServer);
+ Run run = new Run();
+ run.UniqueID=333;
+ run.Description="bon dia";
+ run.Time=919;
+ run.HolaServer(myServer);
+
+ RunInterval runInterval = new RunInterval();
+ runInterval.UniqueID=444;
+ runInterval.Description="bon dia run";
+ runInterval.TimeTotal=1234;
+ runInterval.HolaServer(myServer);
+
// Application.Quit();
/*
Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs (original)
+++ trunk/src/constants.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/event.cs
==============================================================================
--- trunk/src/event.cs (original)
+++ trunk/src/event.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -41,6 +40,10 @@
public Event(string [] eventString) {
}
+ public virtual void HolaServer (ChronojumpServer myServer) {
+ }
+
+
public virtual int InsertAtDB (bool dbconOpened, string tableName) {
Console.WriteLine("++++++++");
return -1;
Modified: trunk/src/eventType.cs
==============================================================================
--- trunk/src/eventType.cs (original)
+++ trunk/src/eventType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/execute/event.cs
==============================================================================
--- trunk/src/execute/event.cs (original)
+++ trunk/src/execute/event.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/execute/jump.cs
==============================================================================
--- trunk/src/execute/jump.cs (original)
+++ trunk/src/execute/jump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/execute/pulse.cs
==============================================================================
--- trunk/src/execute/pulse.cs (original)
+++ trunk/src/execute/pulse.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/execute/reactionTime.cs
==============================================================================
--- trunk/src/execute/reactionTime.cs (original)
+++ trunk/src/execute/reactionTime.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/execute/run.cs
==============================================================================
--- trunk/src/execute/run.cs (original)
+++ trunk/src/execute/run.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/exportSession.cs
==============================================================================
--- trunk/src/exportSession.cs (original)
+++ trunk/src/exportSession.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/about.cs
==============================================================================
--- trunk/src/gui/about.cs (original)
+++ trunk/src/gui/about.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs (original)
+++ trunk/src/gui/chronojump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
@@ -109,6 +108,7 @@
[Widget] Gtk.Button button_rj_j;
[Widget] Gtk.Button button_rj_t;
[Widget] Gtk.Button button_rj_unlimited;
+ [Widget] Gtk.Button button_rj_hexagon;
[Widget] Gtk.Button button_run_custom;
[Widget] Gtk.Button button_run_20m;
[Widget] Gtk.Button button_run_100m;
@@ -160,6 +160,7 @@
[Widget] Gtk.MenuItem rj_j;
[Widget] Gtk.MenuItem rj_t;
[Widget] Gtk.MenuItem rj_unlimited;
+ [Widget] Gtk.MenuItem rj_hexagon;
[Widget] Gtk.MenuItem menuitem_run_custom;
[Widget] Gtk.MenuItem menuitem_20m;
[Widget] Gtk.MenuItem menuitem_100m;
@@ -1002,12 +1003,7 @@
private void on_server_upload_session_accepted (object o, EventArgs args)
{
if(Server.Ping(false, "", "") != Constants.ServerOffline) { //false: don't do insertion
- Server.InitializeSessionVariables();
- Server.app1 = app1;
- Server.currentSession = currentSession; //check that changes come to main currentSession again!!! TODO
- Server.progName = progName;
- Server.progVersion = progVersion;
-
+ Server.InitializeSessionVariables(app1, currentSession, progName, progVersion);
Server.ThreadStart();
} else {
new DialogMessage(Constants.MessageTypes.WARNING, Constants.ServerOffline);
@@ -2335,6 +2331,8 @@
currentEventType = new JumpType("RJ(t)");
} else if(o == (object) button_rj_unlimited) {
currentEventType = new JumpType("RJ(unlimited)");
+ } else if(o == (object) button_rj_hexagon) {
+ currentEventType = new JumpType("RJ(hexagon)");
//run
} else if(o == (object) button_run_custom) {
currentEventType = new RunType("Custom");
@@ -2703,6 +2701,12 @@
//in this jump type, don't ask for limit of jumps or seconds
on_rj_accepted(o, args);
+ } else if(o == (object) button_rj_hexagon || o == (object) rj_hexagon)
+ {
+ currentJumpType = new JumpType("RJ(hexagon)");
+
+ //in this jump type, don't ask for limit of jumps or seconds
+ on_rj_accepted(o, args);
}
}
private void on_rj_accepted (object o, EventArgs args)
Modified: trunk/src/gui/chronopicConnection.cs
==============================================================================
--- trunk/src/gui/chronopicConnection.cs (original)
+++ trunk/src/gui/chronopicConnection.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/confirm.cs
==============================================================================
--- trunk/src/gui/confirm.cs (original)
+++ trunk/src/gui/confirm.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/convertWeight.cs
==============================================================================
--- trunk/src/gui/convertWeight.cs (original)
+++ trunk/src/gui/convertWeight.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/dialogCalendar.cs
==============================================================================
--- trunk/src/gui/dialogCalendar.cs (original)
+++ trunk/src/gui/dialogCalendar.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/dialogImageTest.cs
==============================================================================
--- trunk/src/gui/dialogImageTest.cs (original)
+++ trunk/src/gui/dialogImageTest.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/dialogMessage.cs
==============================================================================
--- trunk/src/gui/dialogMessage.cs (original)
+++ trunk/src/gui/dialogMessage.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/error.cs
==============================================================================
--- trunk/src/gui/error.cs (original)
+++ trunk/src/gui/error.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/event.cs
==============================================================================
--- trunk/src/gui/event.cs (original)
+++ trunk/src/gui/event.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/eventExecute.cs
==============================================================================
--- trunk/src/gui/eventExecute.cs (original)
+++ trunk/src/gui/eventExecute.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/eventGraphConfigure.cs
==============================================================================
--- trunk/src/gui/eventGraphConfigure.cs (original)
+++ trunk/src/gui/eventGraphConfigure.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/genericWindow.cs
==============================================================================
--- trunk/src/gui/genericWindow.cs (original)
+++ trunk/src/gui/genericWindow.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/helpPorts.cs
==============================================================================
--- trunk/src/gui/helpPorts.cs (original)
+++ trunk/src/gui/helpPorts.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/jump.cs
==============================================================================
--- trunk/src/gui/jump.cs (original)
+++ trunk/src/gui/jump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/jumpType.cs
==============================================================================
--- trunk/src/gui/jumpType.cs (original)
+++ trunk/src/gui/jumpType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/language.cs
==============================================================================
--- trunk/src/gui/language.cs (original)
+++ trunk/src/gui/language.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/person.cs
==============================================================================
--- trunk/src/gui/person.cs (original)
+++ trunk/src/gui/person.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/preferences.cs
==============================================================================
--- trunk/src/gui/preferences.cs (original)
+++ trunk/src/gui/preferences.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/pulse.cs
==============================================================================
--- trunk/src/gui/pulse.cs (original)
+++ trunk/src/gui/pulse.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/reactionTime.cs
==============================================================================
--- trunk/src/gui/reactionTime.cs (original)
+++ trunk/src/gui/reactionTime.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/repetitiveConditions.cs
==============================================================================
--- trunk/src/gui/repetitiveConditions.cs (original)
+++ trunk/src/gui/repetitiveConditions.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/report.cs
==============================================================================
--- trunk/src/gui/report.cs (original)
+++ trunk/src/gui/report.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/run.cs
==============================================================================
--- trunk/src/gui/run.cs (original)
+++ trunk/src/gui/run.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/runType.cs
==============================================================================
--- trunk/src/gui/runType.cs (original)
+++ trunk/src/gui/runType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/server.cs
==============================================================================
--- trunk/src/gui/server.cs (original)
+++ trunk/src/gui/server.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -49,6 +48,7 @@
public int pulsesU;
public int pulsesE;
public int pulsesS;
+ public string testTypes;
public SessionUploadPersonData () {
}
@@ -59,7 +59,8 @@
int runsU, int runsE, int runsS,
int runsIU, int runsIE, int runsIS,
int rtsU, int rtsE, int rtsS,
- int pulsesU, int pulsesE, int pulsesS) {
+ int pulsesU, int pulsesE, int pulsesS,
+ string testTypes) {
}
}
@@ -83,6 +84,8 @@
[Widget] Gtk.TreeView treeview_rts;
[Widget] Gtk.TreeView treeview_pulses;
+ [Widget] Gtk.Label label_uploaded_test_types;
+ [Widget] Gtk.Label label_uploaded_sports;
[Widget] Gtk.Label label_thanks;
[Widget] Gtk.Button button_close;
@@ -132,11 +135,9 @@
}
static public SessionUploadWindow Show (Gtk.Window parent)
- //static public SessionUploadWindow Show ()
{
if (SessionUploadWindowBox == null) {
SessionUploadWindowBox = new SessionUploadWindow (parent);
- //SessionUploadWindowBox = new SessionUploadWindow ();
}
SessionUploadWindowBox.session_upload.Show ();
@@ -179,6 +180,9 @@
fillTest (Constants.TestTypes.RUN_I, p.runsIU, p.runsIE, p.runsIS);
fillTest (Constants.TestTypes.RT, p.rtsU, p.rtsE, p.rtsS);
fillTest (Constants.TestTypes.PULSE, p.pulsesU, p.pulsesE, p.pulsesS);
+
+ if(p.testTypes.Length > 0)
+ label_uploaded_test_types.Text = Catalog.GetString("Uploaded") + ": " + p.testTypes;
}
private void fillPerson (Person person, Constants.UploadCodes uCode) {
Modified: trunk/src/gui/session.cs
==============================================================================
--- trunk/src/gui/session.cs (original)
+++ trunk/src/gui/session.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/splash.cs
==============================================================================
--- trunk/src/gui/splash.cs (original)
+++ trunk/src/gui/splash.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/gui/stats.cs
==============================================================================
--- trunk/src/gui/stats.cs (original)
+++ trunk/src/gui/stats.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/jump.cs
==============================================================================
--- trunk/src/jump.cs (original)
+++ trunk/src/jump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -39,22 +38,6 @@
public Jump() {
}
- public override string Prova () {
- return "estic a jump";
- }
-
- public string Prova2 () {
- return "estic a jump2";
- }
-
-//funciona
- public virtual void HolaServer (ChronojumpServer myServer) {
- myServer.Hola("from jump1", uniqueID);
- //myServer.Hola2("from jump2", this);
- myServer.Hola3("from jump3", (Event)this);
- myServer.Hola5("from jump 5", (Event)this, false);
- }
-
//after inserting database (SQL)
public Jump(int uniqueID, int personID, int sessionID, string type, double tv, double tc, int fall, double weight, string description, double angle, int simulated)
{
@@ -87,6 +70,22 @@
this.simulated = Convert.ToInt32(eventString[10]);
}
+ public override string Prova () {
+ return "estic a jump";
+ }
+
+ public string Prova2 () {
+ return "estic a jump2";
+ }
+
+ //funciona
+ public override void HolaServer (ChronojumpServer myServer) {
+ myServer.Hola("from jump1", uniqueID);
+ //myServer.Hola3("from jump3", (Event)this);
+ myServer.Hola5("from jump 5", (Event)this, Constants.TestTypes.JUMP);
+ }
+
+
public override int InsertAtDB (bool dbconOpened, string tableName) {
return SqliteJump.Insert(dbconOpened, tableName,
uniqueID.ToString(),
@@ -156,13 +155,6 @@
public JumpRj() {
}
- public override void HolaServer (ChronojumpServer myServer) {
- myServer.Hola("from jumpRj1", uniqueID);
- //myServer.Hola2("from jumpRj2", this);
- myServer.Hola5("from jumpRj 5", (Event)this, true);
- }
-
-
//after inserting database (SQL)
public JumpRj(int uniqueID, int personID, int sessionID, string type,
string tvString, string tcString, int fall, double weight,
@@ -205,6 +197,14 @@
this.angleString = eventString[16];
this.simulated = Convert.ToInt32(eventString[17]);
}
+
+
+ public override void HolaServer (ChronojumpServer myServer) {
+ myServer.Hola("from jumpRj1", uniqueID);
+ myServer.Hola5("from jumpRj 5", (Event)this, Constants.TestTypes.JUMP_RJ);
+ }
+
+
public override int InsertAtDB (bool dbconOpened, string tableName) {
return SqliteJumpRj.Insert(dbconOpened, tableName,
Modified: trunk/src/jumpType.cs
==============================================================================
--- trunk/src/jumpType.cs (original)
+++ trunk/src/jumpType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -140,6 +139,16 @@
unlimited = true;
description = Catalog.GetString("Reactive Jump unlimited (until finish button is clicked)");
imageFileName = "jump_rj_in.png";
+ } else if(name == "RJ(hexagon)") {
+ startIn = true;
+ hasWeight = false;
+ isRepetitive = true;
+ jumpsLimited = true; //will finish in a concrete jump, not in a concrete second
+ fixedValue = 18; //don't ask for limit of jumps or seconds
+ isPredefined = true;
+ unlimited = false;
+ description = Catalog.GetString("Reactive Jump on a hexagon until three full revolutions are done");
+ imageFileName = "jump_rj_hexagon.png";
} else if(name == "triple jump") {
startIn = false;
hasWeight = false;
Modified: trunk/src/log.cs
==============================================================================
--- trunk/src/log.cs (original)
+++ trunk/src/log.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/person.cs
==============================================================================
--- trunk/src/person.cs (original)
+++ trunk/src/person.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/platform.cs
==============================================================================
--- trunk/src/platform.cs (original)
+++ trunk/src/platform.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/prepareEventGraphObjects.cs
==============================================================================
--- trunk/src/prepareEventGraphObjects.cs (original)
+++ trunk/src/prepareEventGraphObjects.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
-* http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
Modified: trunk/src/pulse.cs
==============================================================================
--- trunk/src/pulse.cs (original)
+++ trunk/src/pulse.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/pulseType.cs
==============================================================================
--- trunk/src/pulseType.cs (original)
+++ trunk/src/pulseType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/reactionTime.cs
==============================================================================
--- trunk/src/reactionTime.cs (original)
+++ trunk/src/reactionTime.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/reactionTimeType.cs
==============================================================================
--- trunk/src/reactionTimeType.cs (original)
+++ trunk/src/reactionTimeType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/report.cs
==============================================================================
--- trunk/src/report.cs (original)
+++ trunk/src/report.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/run.cs
==============================================================================
--- trunk/src/run.cs (original)
+++ trunk/src/run.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -75,6 +74,13 @@
this.description = eventString[6].ToString();
this.simulated = Convert.ToInt32(eventString[7]);
}
+
+ public override void HolaServer (ChronojumpServer myServer) {
+ myServer.Hola("from run1", uniqueID);
+ //myServer.Hola3("from run3", (Event)this);
+ myServer.Hola5("from run 5", (Event)this, Constants.TestTypes.RUN );
+ }
+
public override int InsertAtDB (bool dbconOpened, string tableName) {
return SqliteRun.Insert(dbconOpened, tableName,
@@ -165,6 +171,12 @@
this.limited = eventString[10].ToString();
this.simulated = Convert.ToInt32(eventString[11]);
}
+
+ public override void HolaServer (ChronojumpServer myServer) {
+ myServer.Hola("from runI 1", uniqueID);
+ myServer.Hola5("from runI 5", (Event)this, Constants.TestTypes.RUN_I);
+ }
+
public override int InsertAtDB (bool dbconOpened, string tableName) {
return SqliteRunInterval.Insert(dbconOpened, tableName,
Modified: trunk/src/runType.cs
==============================================================================
--- trunk/src/runType.cs (original)
+++ trunk/src/runType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/server.cs
==============================================================================
--- trunk/src/server.cs (original)
+++ trunk/src/server.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -27,9 +26,19 @@
using Gtk;
using Gdk;
using Glade;
+using System.Net;
+using System.Collections;
public class Server
{
+ private static string getIP() {
+ string strHostName = "";
+ strHostName = System.Net.Dns.GetHostName();
+ IPHostEntry ipEntry = System.Net.Dns.GetHostEntry(strHostName);
+ IPAddress[] addr = ipEntry.AddressList;
+ return addr[addr.Length-1].ToString();
+ }
+
public static string Ping(bool doInsertion, string progName, string progVersion) {
try {
ChronojumpServer myServer = new ChronojumpServer();
@@ -38,7 +47,8 @@
int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
ServerPing myPing = new ServerPing(evalSID, progName + " " + progVersion, Util.GetOS(),
- Constants.IPUnknown, Util.DateParse(DateTime.Now.ToString())); //evaluator, ip, date
+ //Constants.IPUnknown, Util.DateParse(DateTime.Now.ToString())); //evaluator, ip, date
+ getIP(), Util.DateParse(DateTime.Now.ToString())); //evaluator, ip, date
//if !doIsertion nothing will be uploaded,
//is ok for uploadPerson to know if server is online
myPing.UniqueID = myServer.UploadPing(myPing, doInsertion);
@@ -51,23 +61,30 @@
}
}
- /* server session update */
+ /*
+ * server session update
+ */
static Thread thread;
public static SessionUploadWindow sessionUploadWin;
- [Widget] public static Gtk.Window app1;
+ [Widget] static Gtk.Window app1;
- public static Session currentSession;
- public static string progName;
- public static string progVersion;
-
- public static bool serverSessionError;
- public static bool needUpdateServerSession;
- public static bool updatingServerSession;
- public static SessionUploadPersonData sessionUploadPersonData;
+ static Session currentSession;
+ static string progName;
+ static string progVersion;
+
+ static bool serverSessionError;
+ static bool needUpdateServerSession;
+ static bool updatingServerSession;
+ static SessionUploadPersonData sessionUploadPersonData;
- public static void InitializeSessionVariables() {
+ public static void InitializeSessionVariables(Gtk.Window mainApp, Session session, string programName, string programVersion) {
+ app1 = mainApp;
+ currentSession = session;
+ progName = programName;
+ progVersion = programVersion;
+
serverSessionError = false;
needUpdateServerSession = false;
updatingServerSession = false;
@@ -95,7 +112,6 @@
//need to do this, if not it crashes because chronopicWin gets died by thread ending
sessionUploadWin = SessionUploadWindow.Show(app1);
- //sessionUploadWin = SessionUploadWindow.Show();
if(needUpdateServerSession && !updatingServerSession) {
//prevent that FillData is called again with same data
@@ -118,7 +134,7 @@
{
int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
- try {
+// try {
ChronojumpServer myServer = new ChronojumpServer();
Log.WriteLine(myServer.ConnectDatabase());
@@ -139,6 +155,9 @@
myServer.UpdateSession(currentSession.ServerUniqueID, Constants.ServerSessionStates.UPLOADINGDATA);
+ sessionUploadPersonData.testTypes = "";
+ string testTypesSeparator = "";
+
//upload persons (updating also person.serverUniqueID locally)
string [] myPersons = SqlitePersonSession.SelectCurrentSession(serverSession.UniqueID, true, false); //onlyIDAndName, not reversed
Constants.UploadCodes uCode;
@@ -200,7 +219,13 @@
//(one can think that "supra" is another thing
//2- when the same evaluator upload some supra's, only a new type is created
- test.Type = myServer.UploadJumpType(type, evalSID);
+ //test.Type = myServer.UploadJumpType(type, evalSID);
+ string insertedType = myServer.UploadTestType(Constants.TestTypes.JUMP, type, evalSID);
+ if(insertedType != "-1") {
+ test.Type = insertedType;
+ sessionUploadPersonData.testTypes += testTypesSeparator + insertedType;
+ testTypesSeparator = ", ";
+ }
//test.Type in the server will have the correct name "supra-9"
}
@@ -235,6 +260,19 @@
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
+
+ if(test.Simulated == 0) {
+ JumpType type = SqliteJumpType.SelectAndReturnJumpRjType(test.Type);
+ if( ! type.IsPredefined) {
+ string insertedType = myServer.UploadTestType(Constants.TestTypes.JUMP_RJ, type, evalSID);
+ if(insertedType != "-1") {
+ test.Type = insertedType;
+ sessionUploadPersonData.testTypes += testTypesSeparator + insertedType;
+ testTypesSeparator = ", ";
+ }
+ }
+ }
+
//upload...
uCode = serverUploadTest(myServer, Constants.TestTypes.JUMP_RJ, Constants.JumpRjTable, test);
@@ -373,14 +411,16 @@
}
}
-
+
myServer.UpdateSession(currentSession.ServerUniqueID, Constants.ServerSessionStates.DONE);
Log.WriteLine(myServer.DisConnectDatabase());
+ /*
} catch {
//other thread updates the gui:
serverSessionError = true;
}
+ */
}
//upload a person
Modified: trunk/src/serverEvaluator.cs
==============================================================================
--- trunk/src/serverEvaluator.cs (original)
+++ trunk/src/serverEvaluator.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/serverPing.cs
==============================================================================
--- trunk/src/serverPing.cs (original)
+++ trunk/src/serverPing.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/session.cs
==============================================================================
--- trunk/src/session.cs (original)
+++ trunk/src/session.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/sport.cs
==============================================================================
--- trunk/src/sport.cs (original)
+++ trunk/src/sport.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/sqlite/country.cs
==============================================================================
--- trunk/src/sqlite/country.cs (original)
+++ trunk/src/sqlite/country.cs Fri Jan 30 20:27:53 2009
@@ -16,13 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
- */
-
-/*
- * UNUSED BECAUSE USER WILL NOT DEFINE SPORTS BECAUSE THIS WILL MAKE PROBLEMS WITH GLOBAL SPORTS DEFINITION (NOT LOCAL) SPECIALLY IN SPORT TRANSLATIONS
- *
- * SPORTS ARE DEFINED IN constants.cs
*/
Modified: trunk/src/sqlite/event.cs
==============================================================================
--- trunk/src/sqlite/event.cs (original)
+++ trunk/src/sqlite/event.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
-//using System.Data;
-//using System.IO;
-//using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
/* this class has some initializations used for all events */
Modified: trunk/src/sqlite/jump.cs
==============================================================================
--- trunk/src/sqlite/jump.cs (original)
+++ trunk/src/sqlite/jump.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteJump : Sqlite
Modified: trunk/src/sqlite/jumpRj.cs
==============================================================================
--- trunk/src/sqlite/jumpRj.cs (original)
+++ trunk/src/sqlite/jumpRj.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteJumpRj : SqliteJump
Modified: trunk/src/sqlite/jumpType.cs
==============================================================================
--- trunk/src/sqlite/jumpType.cs (original)
+++ trunk/src/sqlite/jumpType.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteJumpType : Sqlite
@@ -118,10 +114,11 @@
protected internal static void initializeTableJumpRjType()
{
string [] iniJumpTypes = {
- //name:startIn:weight:jumpsLimited:limitValue:unlimited:description
+ //name:startIn:weight:jumpsLimited:limitValue:description
"RJ(j):0:0:1:0:RJ limited by jumps",
"RJ(t):0:0:0:0:RJ limited by time",
"RJ(unlimited):1:0:1:-1:Jump unlimited until finish is clicked",
+ "RJ(hexagon):1:0:1:18:Reactive Jump on a hexagon until three full revolutions are done",
"triple jump:0:0:1:3:Triple jump"
};
foreach(string myJumpType in iniJumpTypes) {
Modified: trunk/src/sqlite/main.cs
==============================================================================
--- trunk/src/sqlite/main.cs (original)
+++ trunk/src/sqlite/main.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -74,7 +73,7 @@
* Important2: if database version get numbers higher than 1, check if the comparisons with currentVersion works ok
*/
//static string lastChronojumpDatabaseVersion = "0.60";
- static string lastChronojumpDatabaseVersion = "0.61";
+ static string lastChronojumpDatabaseVersion = "0.62";
public Sqlite() {
}
@@ -529,13 +528,6 @@
SqliteJumpType.JumpTypeInsert ("Rocket:1:0:Rocket jump", true);
- /*
- SqliteRunType.RunTypeInsert ("Agility-20Yard:18.28:20Yard Agility test", true);
- SqliteRunType.RunTypeInsert ("Agility-505:10:505 Agility test", true);
- SqliteRunType.RunTypeInsert ("Agility-Illinois:60:Illinois Agility test", true);
- SqliteRunType.RunTypeInsert ("Agility-Shuttle-Run:40:Shuttle Run Agility test", true);
- SqliteRunType.RunTypeInsert ("Agility-ZigZag:17.6:ZigZag Agility test", true);
- */
string [] iniRunTypes = {
"Agility-20Yard:18.28:20Yard Agility test",
"Agility-505:10:505 Agility test",
@@ -805,6 +797,14 @@
dbcon.Close();
currentVersion = "0.61";
}
+ if(currentVersion == "0.61") {
+ dbcon.Open();
+ SqliteJumpType.JumpRjTypeInsert ("RJ(hexagon):1:0:1:18:Reactive Jump on a hexagon until three full revolutions are done", true);
+ SqlitePreferences.Update ("databaseVersion", "0.62", true);
+ Log.WriteLine("Converted DB to 0.62 added hexagon");
+ dbcon.Close();
+ currentVersion = "0.62";
+ }
}
@@ -921,6 +921,7 @@
SqliteCountry.initialize();
//changes [from - to - desc]
+ //0.61 - 0.62 added hexagon (jumpRj test)
//0.60 - 0.61 added RunIntervalType distancesString (now we van have interval tests with different distances of tracks). Added MTGUG
//0.59 - 0.60 added volumeOn and evaluatorServerID to preferences. Session has now serverUniqueID. Simulated now are -1, because 0 is real and positive is serverUniqueID
//0.58 - 0.59 Added 'showAngle' to preferences, changed angle on jump to double
@@ -1263,6 +1264,29 @@
myReaderStr[i] = reader[i].ToString();
return myReaderStr;
}
+
+ public static int Count (string tableName, bool dbconOpened)
+ {
+ if(!dbconOpened)
+ dbcon.Open();
+
+ dbcmd.CommandText = "SELECT COUNT(*) FROM " + tableName ;
+ Log.WriteLine(dbcmd.CommandText.ToString());
+ dbcmd.ExecuteNonQuery();
+ SqliteDataReader reader;
+ reader = dbcmd.ExecuteReader();
+
+ int myReturn = 0;
+ if(reader.Read())
+ myReturn = Convert.ToInt32(reader[0].ToString());
+ reader.Close();
+
+ if(!dbconOpened)
+ dbcon.Close();
+ return myReturn;
+ }
+
+
/*
* SERVER STUFF
Modified: trunk/src/sqlite/person.cs
==============================================================================
--- trunk/src/sqlite/person.cs (original)
+++ trunk/src/sqlite/person.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqlitePerson : Sqlite
Modified: trunk/src/sqlite/personSession.cs
==============================================================================
--- trunk/src/sqlite/personSession.cs (original)
+++ trunk/src/sqlite/personSession.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
using Mono.Unix;
Modified: trunk/src/sqlite/preferences.cs
==============================================================================
--- trunk/src/sqlite/preferences.cs (original)
+++ trunk/src/sqlite/preferences.cs Fri Jan 30 20:27:53 2009
@@ -16,16 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqlitePreferences : Sqlite
Modified: trunk/src/sqlite/pulse.cs
==============================================================================
--- trunk/src/sqlite/pulse.cs (original)
+++ trunk/src/sqlite/pulse.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqlitePulse : Sqlite
Modified: trunk/src/sqlite/pulseType.cs
==============================================================================
--- trunk/src/sqlite/pulseType.cs (original)
+++ trunk/src/sqlite/pulseType.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqlitePulseType : Sqlite
Modified: trunk/src/sqlite/reactionTime.cs
==============================================================================
--- trunk/src/sqlite/reactionTime.cs (original)
+++ trunk/src/sqlite/reactionTime.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteReactionTime : Sqlite
Modified: trunk/src/sqlite/run.cs
==============================================================================
--- trunk/src/sqlite/run.cs (original)
+++ trunk/src/sqlite/run.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteRun : Sqlite
Modified: trunk/src/sqlite/runInterval.cs
==============================================================================
--- trunk/src/sqlite/runInterval.cs (original)
+++ trunk/src/sqlite/runInterval.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteRunInterval : SqliteRun
Modified: trunk/src/sqlite/runType.cs
==============================================================================
--- trunk/src/sqlite/runType.cs (original)
+++ trunk/src/sqlite/runType.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteRunType : Sqlite
Modified: trunk/src/sqlite/server.cs
==============================================================================
--- trunk/src/sqlite/server.cs (original)
+++ trunk/src/sqlite/server.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
using Mono.Unix; //Catalog
@@ -116,42 +112,26 @@
return myReturn;
}
- public static ArrayList Stats()
- {
+ public static ArrayList Stats() {
+ ArrayList stats = new ArrayList();
+
dbcon.Open();
- dbcmd.CommandText = "SELECT " +
- " MAX(SPing.uniqueID), MAX(SEvaluator.uniqueID), MAX(session.uniqueID), MAX(person.uniqueID) " +
- //", " +
- //" MAX(jump.uniqueID), MAX(jumpRj.uniqueID), MAX(run.uniqueID), MAX(runInterval.uniqueID), "+
- //" MAX(reactionTime.uniqueID), MAX(pulse.uniqueID)" +
- " FROM SPing, SEvaluator, session, person";
- //, jump, jumpRj, run, runInterval, reactionTime, pulse";
- Log.WriteLine(dbcmd.CommandText.ToString());
- dbcmd.ExecuteNonQuery();
- //TODO: problema quan no hi ha registres d'alguna tabla, com per exemple: reactionTime, llavors dona sempre: |||||||||
-
- SqliteDataReader reader;
- reader = dbcmd.ExecuteReader();
- ArrayList myArray = new ArrayList(1);
-
- while(reader.Read()) {
- myArray.Add(Catalog.GetString("Pings") + ": " + reader[0].ToString()); //ping
- myArray.Add(Catalog.GetString("Evaluators") + ": " + reader[1].ToString()); //eval
- myArray.Add(Catalog.GetString("Sessions") + ": " + reader[2].ToString()); //sess
- myArray.Add(Catalog.GetString("Persons") + ": " + reader[3].ToString()); //pers
- /*
- myArray.Add(reader[4].ToString()); //jump
- myArray.Add(reader[5].ToString()); //jumpRj
- myArray.Add(reader[6].ToString()); //run
- myArray.Add(reader[7].ToString()); //runI
- myArray.Add(reader[8].ToString()); //rt
- myArray.Add(reader[9].ToString()); //pulse
- */
- }
+ stats.Add("Pings\t" + Sqlite.Count(Constants.ServerPingTable, true).ToString());
+ stats.Add("Evaluators\t" + Sqlite.Count(Constants.ServerEvaluatorTable, true).ToString());
+ stats.Add("Persons\t" + Sqlite.Count(Constants.PersonTable, true).ToString());
+ stats.Add("Sessions\t" + Sqlite.Count(Constants.SessionTable, true).ToString());
+ stats.Add("Jumps\t" + Sqlite.Count(Constants.JumpTable, true).ToString());
+ stats.Add("JumpsRj\t" + Sqlite.Count(Constants.JumpRjTable, true).ToString());
+ stats.Add("Runs\t" + Sqlite.Count(Constants.RunTable, true).ToString());
+ stats.Add("RunsInterval\t" + Sqlite.Count(Constants.RunIntervalTable, true).ToString());
+ stats.Add("Reaction times\t" + Sqlite.Count(Constants.ReactionTimeTable, true).ToString());
+ stats.Add("Pulses\t" + Sqlite.Count(Constants.PulseTable, true).ToString());
dbcon.Close();
- return myArray;
+
+ return stats;
}
+
}
Modified: trunk/src/sqlite/session.cs
==============================================================================
--- trunk/src/sqlite/session.cs (original)
+++ trunk/src/sqlite/session.cs Fri Jan 30 20:27:53 2009
@@ -16,17 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
using Mono.Unix;
Modified: trunk/src/sqlite/speciallity.cs
==============================================================================
--- trunk/src/sqlite/speciallity.cs (original)
+++ trunk/src/sqlite/speciallity.cs Fri Jan 30 20:27:53 2009
@@ -16,13 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
- */
-
-/*
- * UNUSED BECAUSE USER WILL NOT DEFINE SPORTS BECAUSE THIS WILL MAKE PROBLEMS WITH GLOBAL SPORTS DEFINITION (NOT LOCAL) SPECIALLY IN SPORT TRANSLATIONS
- *
- * SPORTS ARE DEFINED IN constants.cs
*/
@@ -30,10 +23,7 @@
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
using Mono.Unix;
Modified: trunk/src/sqlite/sport.cs
==============================================================================
--- trunk/src/sqlite/sport.cs (original)
+++ trunk/src/sqlite/sport.cs Fri Jan 30 20:27:53 2009
@@ -16,13 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
- */
-
-/*
- * UNUSED BECAUSE USER WILL NOT DEFINE SPORTS BECAUSE THIS WILL MAKE PROBLEMS WITH GLOBAL SPORTS DEFINITION (NOT LOCAL) SPECIALLY IN SPORT TRANSLATIONS
- *
- * SPORTS ARE DEFINED IN constants.cs
*/
@@ -30,10 +23,7 @@
using System.Data;
using System.IO;
using System.Collections; //ArrayList
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
using Mono.Unix;
Modified: trunk/src/sqlite/stat.cs
==============================================================================
--- trunk/src/sqlite/stat.cs (original)
+++ trunk/src/sqlite/stat.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
@@ -24,10 +23,7 @@
using System.IO;
using System.Collections; //ArrayList
using Mono.Unix;
-//using Mono.Data.SqliteClient;
-//using System.Data.SqlClient;
using Mono.Data.Sqlite;
-//using System.Data.SQLite;
class SqliteStat : Sqlite
Modified: trunk/src/statType.cs
==============================================================================
--- trunk/src/statType.cs (original)
+++ trunk/src/statType.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/djIndex.cs
==============================================================================
--- trunk/src/stats/djIndex.cs (original)
+++ trunk/src/stats/djIndex.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/djQ.cs
==============================================================================
--- trunk/src/stats/djQ.cs (original)
+++ trunk/src/stats/djQ.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/fv.cs
==============================================================================
--- trunk/src/stats/fv.cs (original)
+++ trunk/src/stats/fv.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/global.cs
==============================================================================
--- trunk/src/stats/global.cs (original)
+++ trunk/src/stats/global.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/djIndex.cs
==============================================================================
--- trunk/src/stats/graphs/djIndex.cs (original)
+++ trunk/src/stats/graphs/djIndex.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/djQ.cs
==============================================================================
--- trunk/src/stats/graphs/djQ.cs (original)
+++ trunk/src/stats/graphs/djQ.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/fv.cs
==============================================================================
--- trunk/src/stats/graphs/fv.cs (original)
+++ trunk/src/stats/graphs/fv.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/global.cs
==============================================================================
--- trunk/src/stats/graphs/global.cs (original)
+++ trunk/src/stats/graphs/global.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/graphData.cs
==============================================================================
--- trunk/src/stats/graphs/graphData.cs (original)
+++ trunk/src/stats/graphs/graphData.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/graphSerie.cs
==============================================================================
--- trunk/src/stats/graphs/graphSerie.cs (original)
+++ trunk/src/stats/graphs/graphSerie.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/ieIub.cs
==============================================================================
--- trunk/src/stats/graphs/ieIub.cs (original)
+++ trunk/src/stats/graphs/ieIub.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/potency.cs
==============================================================================
--- trunk/src/stats/graphs/potency.cs (original)
+++ trunk/src/stats/graphs/potency.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/rjAVGSD.cs
==============================================================================
--- trunk/src/stats/graphs/rjAVGSD.cs (original)
+++ trunk/src/stats/graphs/rjAVGSD.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/rjEvolution.cs
==============================================================================
--- trunk/src/stats/graphs/rjEvolution.cs (original)
+++ trunk/src/stats/graphs/rjEvolution.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/rjIndex.cs
==============================================================================
--- trunk/src/stats/graphs/rjIndex.cs (original)
+++ trunk/src/stats/graphs/rjIndex.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/rjPotencyBosco.cs
==============================================================================
--- trunk/src/stats/graphs/rjPotencyBosco.cs (original)
+++ trunk/src/stats/graphs/rjPotencyBosco.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/sjCmjAbk.cs
==============================================================================
--- trunk/src/stats/graphs/sjCmjAbk.cs (original)
+++ trunk/src/stats/graphs/sjCmjAbk.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/graphs/sjCmjAbkPlus.cs
==============================================================================
--- trunk/src/stats/graphs/sjCmjAbkPlus.cs (original)
+++ trunk/src/stats/graphs/sjCmjAbkPlus.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/ieIub.cs
==============================================================================
--- trunk/src/stats/ieIub.cs (original)
+++ trunk/src/stats/ieIub.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/main.cs
==============================================================================
--- trunk/src/stats/main.cs (original)
+++ trunk/src/stats/main.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/potency.cs
==============================================================================
--- trunk/src/stats/potency.cs (original)
+++ trunk/src/stats/potency.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/rjAVGSD.cs
==============================================================================
--- trunk/src/stats/rjAVGSD.cs (original)
+++ trunk/src/stats/rjAVGSD.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/rjEvolution.cs
==============================================================================
--- trunk/src/stats/rjEvolution.cs (original)
+++ trunk/src/stats/rjEvolution.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/rjIndex.cs
==============================================================================
--- trunk/src/stats/rjIndex.cs (original)
+++ trunk/src/stats/rjIndex.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/rjPotencyBosco.cs
==============================================================================
--- trunk/src/stats/rjPotencyBosco.cs (original)
+++ trunk/src/stats/rjPotencyBosco.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/sjCmjAbk.cs
==============================================================================
--- trunk/src/stats/sjCmjAbk.cs (original)
+++ trunk/src/stats/sjCmjAbk.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/stats/sjCmjAbkPlus.cs
==============================================================================
--- trunk/src/stats/sjCmjAbkPlus.cs (original)
+++ trunk/src/stats/sjCmjAbkPlus.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewEvent.cs
==============================================================================
--- trunk/src/treeViewEvent.cs (original)
+++ trunk/src/treeViewEvent.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewJump.cs
==============================================================================
--- trunk/src/treeViewJump.cs (original)
+++ trunk/src/treeViewJump.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewPerson.cs
==============================================================================
--- trunk/src/treeViewPerson.cs (original)
+++ trunk/src/treeViewPerson.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewPulse.cs
==============================================================================
--- trunk/src/treeViewPulse.cs (original)
+++ trunk/src/treeViewPulse.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewReactionTime.cs
==============================================================================
--- trunk/src/treeViewReactionTime.cs (original)
+++ trunk/src/treeViewReactionTime.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/treeViewRun.cs
==============================================================================
--- trunk/src/treeViewRun.cs (original)
+++ trunk/src/treeViewRun.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/updateProgressBar.cs
==============================================================================
--- trunk/src/updateProgressBar.cs (original)
+++ trunk/src/updateProgressBar.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
-* http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
Modified: trunk/src/util.cs
==============================================================================
--- trunk/src/util.cs (original)
+++ trunk/src/util.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/src/utilGtk.cs
==============================================================================
--- trunk/src/utilGtk.cs (original)
+++ trunk/src/utilGtk.cs Fri Jan 30 20:27:53 2009
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Xavier de Blas:
- * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
*/
using System;
Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt (original)
+++ trunk/version.txt Fri Jan 30 20:27:53 2009
@@ -1 +1 @@
-0.8.1.4
+0.8.1.6
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
