Commit 40f99283 authored by Xavier de Blas's avatar Xavier de Blas

23 jan 2008 0.8.1.3 insert session now insert all it's persons

23 jan 2008
	0.8.1.3
	insert session now insert all it's persons

	added src/serverEvaluator.cs, remember to svn add

	0.8.1.2
	Finished the server SPing, SEvaluator, server session code
	done server stats with: pings, evaluators,
	sessions, persons. TODO: tests

	db 0.60: 
	-added volumeOn and evaluatorServerID to preferences. 
	-Session has serverUniqueID. Simulated tests now are -1, because 0 is real and
	positive is serverUniqueID
	
	convertedTables of tests to put a serverUniqueID 
		simulated now contains the serverUniqueID:
		-1 simulated test
		0 real test not uploaded
		>0 serverUniqueID of uploaded test


	try-catch on sound playing



svn path=/trunk/; revision=442
parent 1d2d065f
......@@ -45,7 +45,7 @@ CHRONOJUMP_DEP_EXECUTE = src/execute/event.cs src/execute/jump.cs src/execute/ru
CHRONOJUMP_DEP_SERVER = chronojump_server/ChronojumpServer.cs
CHRONOJUMP_DEP = src/chronojump.cs src/person.cs src/event.cs src/eventType.cs src/jump.cs src/jumpType.cs src/run.cs src/runType.cs src/pulse.cs src/pulseType.cs src/reactionTime.cs src/reactionTimeType.cs src/session.cs src/exportSession.cs src/treeViewEvent.cs src/treeViewPerson.cs src/treeViewJump.cs src/treeViewRun.cs src/treeViewPulse.cs src/treeViewReactionTime.cs src/util.cs src/utilGtk.cs src/constants.cs src/report.cs src/updateProgressBar.cs src/prepareEventGraphObjects.cs src/sport.cs src/log.cs src/serverPing.cs $(CHRONOJUMP_DEP_GUI) $(CHRONOJUMP_DEP_STATS) $(CHRONOJUMP_DEP_GRAPHS) $(CHRONOJUMP_DEP_SQLITE) $(CHRONOJUMP_DEP_REPORT) $(CHRONOJUMP_DEP_EXECUTE) $(CHRONOJUMP_DEP_SERVER)
CHRONOJUMP_DEP = src/chronojump.cs src/person.cs src/event.cs src/eventType.cs src/jump.cs src/jumpType.cs src/run.cs src/runType.cs src/pulse.cs src/pulseType.cs src/reactionTime.cs src/reactionTimeType.cs src/session.cs src/exportSession.cs src/treeViewEvent.cs src/treeViewPerson.cs src/treeViewJump.cs src/treeViewRun.cs src/treeViewPulse.cs src/treeViewReactionTime.cs src/util.cs src/utilGtk.cs src/constants.cs src/report.cs src/updateProgressBar.cs src/prepareEventGraphObjects.cs src/sport.cs src/log.cs src/serverPing.cs src/serverEvaluator.cs $(CHRONOJUMP_DEP_GUI) $(CHRONOJUMP_DEP_STATS) $(CHRONOJUMP_DEP_GRAPHS) $(CHRONOJUMP_DEP_SQLITE) $(CHRONOJUMP_DEP_REPORT) $(CHRONOJUMP_DEP_EXECUTE) $(CHRONOJUMP_DEP_SERVER)
RESOURCES_GLADE = -resource:glade/chronojump.glade,chronojump.glade
......@@ -106,7 +106,7 @@ CHRONOJUMP_MINI_DEP = src/chronojump_mini.cs src/chronopic.cs src/util.cs src/lo
#--------Dependences of CHRONOJUMP_SERVER
CHRONOJUMP_SERVER_DEP = chronojump_server/chronojumpServerCSharp.cs src/sqlite/*.cs src/util.cs src/person.cs src/event.cs src/jump.cs src/run.cs src/pulse.cs src/reactionTime.cs src/session.cs src/eventType.cs src/jumpType.cs src/runType.cs src/pulseType.cs src/sport.cs src/constants.cs src/log.cs src/serverPing.cs
CHRONOJUMP_SERVER_DEP = chronojump_server/chronojumpServerCSharp.cs src/sqlite/*.cs src/util.cs src/person.cs src/event.cs src/jump.cs src/run.cs src/pulse.cs src/reactionTime.cs src/session.cs src/eventType.cs src/jumpType.cs src/runType.cs src/pulseType.cs src/sport.cs src/constants.cs src/log.cs src/serverPing.cs src/serverEvaluator.cs
#--------Makefiles
......@@ -147,8 +147,8 @@ $(CHRONOJUMP_MINI).prg: $(CHRONOJUMP_MINI_DEP)
$(CHRONOJUMP_SERVER).dll: $(CHRONOJUMP_SERVER_DEP) chronojump_server/chronojumpServer.asmx
$(MCS) -t:library -out:chronojump_server/bin/chronojumpServer.dll -r:System.Data -r:Mono.Data.Sqlite -r:System.Web.Services -r:Mono.Posix $(CHRONOJUMP_SERVER_DEP)
#currently deactivated WSDL compilation: (seems it doesn't work because when there's no network, there's no localhost)
#$(WSDL)
#currently deactivated WSDL compilation: (seems it doesn't work because when there's no network, there's no localhost)
#$(WSDL)
#--------------------------
......
Finishing the SPing code
write a version compatibility thing for each server method, and if not
compatible, tell user to update it's chronojump version
check if server is online in a separate place on gui/chronojump.cs
Add the Maria Giné test
todo: record ip in SPing
todo: upload a test (will upload it's person if not done before)
todo: upload a session (except already uploaded tests, also check don't upload
already uploaded persons)
created server/session table (need to test)
user can upload a session:
-session will be uploaded
-person and personSession will be uploaded
-tests will be uploaded
-uploadingState will change all the time
23 jan 2008
0.8.1.3
insert session now insert all it's persons
added src/serverEvaluator.cs, remember to svn add
0.8.1.2
Finished the server SPing, SEvaluator, server session code
done server stats with: pings, evaluators,
sessions, persons. TODO: tests
db 0.60:
-added volumeOn and evaluatorServerID to preferences.
-Session has serverUniqueID. Simulated tests now are -1, because 0 is real and
positive is serverUniqueID
convertedTables of tests to put a serverUniqueID
simulated now contains the serverUniqueID:
-1 simulated test
0 real test not uploaded
>0 serverUniqueID of uploaded test
try-catch on sound playing
16 jan 2008
Now we are able to connect from client gtk (corall) to server on pinux and do a ping, or insert a
......
......@@ -66,6 +66,7 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
/// <remarks>
///Select person name
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/SelectPersonName", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public string SelectPersonName(int personID) {
......@@ -86,6 +87,7 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
/// <remarks>
///See all persons
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/SelectAllPersons", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public ArrayList SelectAllPersons() {
......@@ -97,13 +99,35 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
return this.BeginInvoke("SelectAllPersons", new object[0], callback, asyncState);
}
public string[] EndSelectAllPersons(System.IAsyncResult asyncResult) {
//public string[] EndSelectAllPersons(System.IAsyncResult asyncResult) {
public ArrayList EndSelectAllPersons(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((string[])(results[0]));
//return ((string[])(results[0]));
return ((ArrayList)(results[0]));
}
/// <remarks>
///Stats
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/Stats", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public ArrayList Stats() {
object[] results = this.Invoke("Stats", new object[0]);
return ((ArrayList)(results[0]));
}
public System.IAsyncResult BeginStats(System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("Stats", new object[0], callback, asyncState);
}
public ArrayList EndStats(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((ArrayList)(results[0]));
}
/// <remarks>
///Select events from all persons
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/SelectAllPersonEvents", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public object[] SelectAllPersonEvents(int personID) {
......@@ -122,8 +146,30 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
return ((object[])(results[0]));
}
/// <remarks>
///Insert session
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/InsertSession", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public int InsertSession(ServerSession mySession) {
object[] results = this.Invoke("InsertSession", new object[] {
mySession});
return ((int)(results[0]));
}
public System.IAsyncResult BeginInsertSession(ServerSession mySession, System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("InsertSession", new object[] {
mySession}, callback, asyncState);
}
public int EndInsertSession(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
/// <remarks>
///Insert person
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/InsertPerson", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public int InsertPerson(Person myPerson, int sessionID) {
......@@ -144,12 +190,13 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
/// <remarks>
///Insert ping
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/InsertPing", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public object[] InsertPing(ServerPing myPing) {
public int InsertPing(ServerPing myPing) {
object[] results = this.Invoke("InsertPing", new object[] {
myPing});
return ((object[])(results[0]));
return ((int)(results[0]));
}
public System.IAsyncResult BeginInsertPing(ServerPing myPing, System.AsyncCallback callback, object asyncState) {
......@@ -157,13 +204,56 @@ public class ChronojumpServer : System.Web.Services.Protocols.SoapHttpClientProt
myPing}, callback, asyncState);
}
public object[] EndInsertPing(System.IAsyncResult asyncResult) {
public int EndInsertPing(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((object[])(results[0]));
return ((int)(results[0]));
}
/// <remarks>
///Insert evaluator
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/InsertEvaluator", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public int InsertEvaluator(ServerEvaluator myEval) {
object[] results = this.Invoke("InsertEvaluator", new object[] {
myEval});
return ((int)(results[0]));
}
public System.IAsyncResult BeginInsertEvaluator(ServerEvaluator myEval, System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("InsertEvaluator", new object[] {
myEval}, callback, asyncState);
}
public int EndInsertEvaluator(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
/// <remarks>
///Update session
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/UpdateSession", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public int UpdateSession(int sessionID, Constants.ServerSessionStates state) {
object[] results = this.Invoke("UpdateSession", new object[] {
sessionID, state});
return ((int)(results[0]));
}
public System.IAsyncResult BeginUpdateSession(int sessionID, Constants.ServerSessionStates state, System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("UpdateSession", new object[] {
sessionID, state}, callback, asyncState);
}
public int EndUpdateSession(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((int)(results[0]));
}
/// <remarks>
///List directory files (only as a sample)
///important: variable names here have to be the same than in ChronojumpServerCSharp.cs
///</remarks>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://80.32.81.197:8080/ListDirectory", RequestNamespace="http://80.32.81.197:8080/", ResponseNamespace="http://80.32.81.197:8080/", ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped, Use=System.Web.Services.Description.SoapBindingUse.Literal)]
public string[] ListDirectory(string path) {
......
......@@ -8244,7 +8244,7 @@ options</property>
<signal name="activate" handler="on_new_activate" last_modification_time="Wed, 22 Sep 2004 23:55:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3428">
<widget class="GtkImage" id="image3598">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -8265,7 +8265,7 @@ options</property>
<signal name="activate" handler="on_open_activate" last_modification_time="Wed, 22 Sep 2004 23:55:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3429">
<widget class="GtkImage" id="image3599">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -8286,7 +8286,7 @@ options</property>
<signal name="activate" handler="on_edit_session_activate" last_modification_time="Tue, 26 Jul 2005 19:12:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3430">
<widget class="GtkImage" id="image3600">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -8308,7 +8308,7 @@ options</property>
<signal name="activate" handler="on_delete_session_activate" last_modification_time="Thu, 28 Jul 2005 13:37:42 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3431">
<widget class="GtkImage" id="image3601">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -8336,7 +8336,7 @@ options</property>
<signal name="activate" handler="on_export_session_activate" last_modification_time="Sat, 12 Feb 2005 21:57:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3432">
<widget class="GtkImage" id="image3602">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
......@@ -8372,7 +8372,7 @@ options</property>
<signal name="activate" handler="on_preferences_activate" last_modification_time="Mon, 04 Oct 2004 19:19:19 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3433">
<widget class="GtkImage" id="image3603">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
......@@ -8409,6 +8409,45 @@ options</property>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separador19">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_server_insert_person">
<property name="visible">True</property>
<property name="label" translatable="yes">Insert current person</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menuitem_server_insert_person" last_modification_time="Wed, 14 Jan 2009 02:03:56 GMT"/>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_server_insert_evaluator">
<property name="visible">True</property>
<property name="label" translatable="yes">Insert evaluator</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menuitem_server_insert_evaluator" last_modification_time="Wed, 21 Jan 2009 13:35:37 GMT"/>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_server_insert_session">
<property name="visible">True</property>
<property name="label" translatable="yes">Insert current session</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menuitem_server_insert_session" last_modification_time="Thu, 22 Jan 2009 11:41:40 GMT"/>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separador20">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_server_see_all">
<property name="visible">True</property>
......@@ -8419,11 +8458,11 @@ options</property>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_server_insert_person">
<widget class="GtkMenuItem" id="menuitem_server_stats">
<property name="visible">True</property>
<property name="label" translatable="yes">Insert_current_person</property>
<property name="label" translatable="yes">Stats</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menuitem_server_insert_person" last_modification_time="Wed, 14 Jan 2009 02:03:56 GMT"/>
<signal name="activate" handler="on_menuitem_server_stats" last_modification_time="Thu, 22 Jan 2009 13:19:24 GMT"/>
</widget>
</child>
</widget>
......@@ -8445,7 +8484,7 @@ options</property>
<signal name="activate" handler="on_quit1_activate" last_modification_time="Wed, 22 Sep 2004 23:17:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3434">
<widget class="GtkImage" id="image3604">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon_size">1</property>
......@@ -8479,7 +8518,7 @@ options</property>
<signal name="activate" handler="on_person_add_single_activate" last_modification_time="Thu, 18 Aug 2005 23:07:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3435">
<widget class="GtkImage" id="image3605">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -8500,7 +8539,7 @@ options</property>
<signal name="activate" handler="on_person_add_multiple_activate" last_modification_time="Thu, 18 Aug 2005 23:01:23 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3436">
<widget class="GtkImage" id="image3606">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -8527,7 +8566,7 @@ options</property>
<signal name="activate" handler="on_recuperate_person_activate" last_modification_time="Sun, 12 Dec 2004 00:40:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3437">
<widget class="GtkImage" id="image3607">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -8548,7 +8587,7 @@ options</property>
<signal name="activate" handler="on_recuperate_persons_from_session_activate" last_modification_time="Tue, 26 Jul 2005 19:12:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3438">
<widget class="GtkImage" id="image3608">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -8575,7 +8614,7 @@ options</property>
<signal name="activate" handler="on_edit_current_person_clicked" last_modification_time="Sun, 17 Oct 2004 11:43:33 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3439">
<widget class="GtkImage" id="image3609">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -8596,7 +8635,7 @@ options</property>
<signal name="activate" handler="on_show_all_person_events_activate" last_modification_time="Mon, 29 Aug 2005 09:51:24 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3440">
<widget class="GtkImage" id="image3610">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
......@@ -8623,7 +8662,7 @@ options</property>
<signal name="activate" handler="on_delete_current_person_from_session_activate" last_modification_time="Thu, 28 Jul 2005 15:49:38 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3441">
<widget class="GtkImage" id="image3611">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -8735,7 +8774,7 @@ options</property>
<signal name="activate" handler="on_button_more_clicked" last_modification_time="Thu, 10 Mar 2005 18:52:25 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3442">
<widget class="GtkImage" id="image3612">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -8760,7 +8799,7 @@ options</property>
<signal name="activate" handler="on_edit_selected_jump_clicked" last_modification_time="Sun, 17 Oct 2004 11:47:42 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3443">
<widget class="GtkImage" id="image3613">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -8781,7 +8820,7 @@ options</property>
<signal name="activate" handler="on_delete_selected_jump_clicked" last_modification_time="Tue, 19 Oct 2004 11:54:17 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3444">
<widget class="GtkImage" id="image3614">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -8847,7 +8886,7 @@ options</property>
<signal name="activate" handler="on_button_more_rj_clicked" last_modification_time="Fri, 11 Mar 2005 14:45:23 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3445">
<widget class="GtkImage" id="image3615">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -8872,7 +8911,7 @@ options</property>
<signal name="activate" handler="on_edit_selected_jump_rj_clicked" last_modification_time="Sun, 07 Nov 2004 17:37:37 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3446">
<widget class="GtkImage" id="image3616">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -8893,7 +8932,7 @@ options</property>
<signal name="activate" handler="on_repair_selected_reactive_jump_clicked" last_modification_time="Wed, 07 Dec 2005 01:14:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3447">
<widget class="GtkImage" id="image3617">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
......@@ -8914,7 +8953,7 @@ options</property>
<signal name="activate" handler="on_delete_selected_jump_rj_clicked" last_modification_time="Sun, 07 Nov 2004 17:37:37 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3448">
<widget class="GtkImage" id="image3618">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -8941,7 +8980,7 @@ options</property>
<signal name="activate" handler="on_jump_type_add_activate" last_modification_time="Thu, 10 Mar 2005 18:52:25 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3449">
<widget class="GtkImage" id="image3619">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -9086,7 +9125,7 @@ options</property>
<signal name="activate" handler="on_button_run_more_clicked" last_modification_time="Fri, 22 Apr 2005 14:37:06 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3450">
<widget class="GtkImage" id="image3620">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -9111,7 +9150,7 @@ options</property>
<signal name="activate" handler="on_edit_selected_run_clicked" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3451">
<widget class="GtkImage" id="image3621">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -9132,7 +9171,7 @@ options</property>
<signal name="activate" handler="on_delete_selected_run_clicked" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3452">
<widget class="GtkImage" id="image3622">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -9198,7 +9237,7 @@ options</property>
<signal name="activate" handler="on_button_run_interval_more_clicked" last_modification_time="Tue, 16 Aug 2005 01:18:41 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3453">
<widget class="GtkImage" id="image3623">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -9223,7 +9262,7 @@ options</property>
<signal name="activate" handler="on_edit_selected_run_interval_clicked" last_modification_time="Tue, 16 Aug 2005 12:33:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3454">
<widget class="GtkImage" id="image3624">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -9244,7 +9283,7 @@ options</property>
<signal name="activate" handler="on_repair_selected_run_interval_clicked" last_modification_time="Wed, 03 May 2006 15:15:38 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3455">
<widget class="GtkImage" id="image3625">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
......@@ -9265,7 +9304,7 @@ options</property>
<signal name="activate" handler="on_delete_selected_run_interval_clicked" last_modification_time="Tue, 16 Aug 2005 12:33:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3456">
<widget class="GtkImage" id="image3626">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -9292,7 +9331,7 @@ options</property>
<signal name="activate" handler="on_run_type_add_activate" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3457">
<widget class="GtkImage" id="image3627">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -9372,7 +9411,7 @@ options</property>
<signal name="activate" handler="on_menuitem_view_stats_activate" last_modification_time="Tue, 26 Jul 2005 23:54:29 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3458">
<widget class="GtkImage" id="image3628">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
......@@ -9393,7 +9432,7 @@ options</property>
<signal name="activate" handler="on_show_report_activate" last_modification_time="Tue, 06 Sep 2005 09:10:32 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3459">
<widget class="GtkImage" id="image3629">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
......@@ -9461,7 +9500,7 @@ options</property>
<signal name="activate" handler="on_menuitem_manual_activate" last_modification_time="Wed, 03 Oct 2007 23:31:41 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3460">
<widget class="GtkImage" id="image3630">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
......@@ -9497,7 +9536,7 @@ options</property>
<signal name="activate" handler="on_about1_activate" last_modification_time="Wed, 22 Sep 2004 23:17:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3461">
<widget class="GtkImage" id="image3631">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>
......@@ -9524,7 +9563,7 @@ options</property>
<signal name="activate" handler="on_debug_crash_activate" last_modification_time="Thu, 23 Oct 2008 22:57:02 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image3462">
<widget class="GtkImage" id="image3632">
<property name="visible">True</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">1</property>
......
......@@ -31,9 +31,10 @@ src/report.cs
src/runType.cs
src/sqlite/country.cs
src/sqlite/personSession.cs
src/sqlite/server.cs
src/sqlite/session.cs
src/sqlite/speciallity.cs
src/sqlite/sport.cs
src/sqlite/session.cs
src/sqlite/stat.cs
src/statType.cs
src/stats/potency.cs
......
......@@ -2,6 +2,16 @@ do that validation does the skin method and the black method, instead of
having a black method full of validation things
at end, validation should add compare code
findHoles should work only on ROIs (Region Of Interest).
The best is to ask first user for the points and play with the threshold in
ROI (don't with the hole image). ROI is always in the middle of
point (in future, ROI is detected by kalvan)
If the point gets lost on that ROI, ask user again
Ability to record thresold for next person and load
max size of point should be marked vy software, and also size of ROI
(maybe in future, ROI of toe could be little than other ROIs (that move fast)
des 18
changee toe to not allow to be one pixel width (really bottom of the
......
......@@ -427,6 +427,9 @@ int main(int argc,char **argv)
cvFlip( frame, frame_copy, 0 );
imageGuiResult(gui, "a", font);
//cvWaitKey(50); //to print above message
if(!gray)
{
gray = cvCreateImage(cvGetSize(frame),IPL_DEPTH_8U,1);
......@@ -454,7 +457,9 @@ int main(int argc,char **argv)
cvSmooth(frame_copy,frame_copy,2,5,5);
cvCvtColor(frame_copy,gray,CV_BGR2GRAY);
CvRect maxrect;
imageGuiResult(gui, "b", font);
//cvWaitKey(50); //to print above message
/*
* 3
......@@ -477,9 +482,13 @@ int main(int argc,char **argv)
cvCvtColor(frame_copy,output,CV_BGR2GRAY);
cvThreshold(gray, output, threshold, thresholdMax,CV_THRESH_BINARY_INV);
imageGuiResult(gui, "b1", font);
//cvWaitKey(50); //to print above message
if(thresholdROIH != -1 || thresholdROIK != -1 || thresholdROIT != -1) {
imageGuiResult(gui, "b2", font);
//cvWaitKey(50); //to print above message
int pointSize = 30;
CvRect rect;
rect.width=pointSize; rect.height=pointSize;
......@@ -516,6 +525,8 @@ int main(int argc,char **argv)
cvResetImageROI(gray);
cvResetImageROI(output);
}
imageGuiResult(gui, "b3", font);
//cvWaitKey(50); //to print above message
// sprintf(label, "frame: %d", framesCount);
......@@ -526,25 +537,33 @@ int main(int argc,char **argv)
imagePrint(output, cvPoint(frame->width -200, frame->height-20), label, font, BLACK);
cvShowImage("threshold", output);
imageGuiResult(gui, "b4", font);
//cvWaitKey(50); //to print above message
}
if(framesCount >1) {
imageGuiResult(gui, "b41", font);
//cvWaitKey(50); //to print above message
CvSeq* seqHolesEnd = findHolesSkin(output, frame_copy, hipMarked, kneeMarked, toeMarked, font);
imageGuiResult(gui, "b42", font);
//cvWaitKey(50); //to print above message
hipMarked = *CV_GET_SEQ_ELEM( CvPoint, seqHolesEnd, 0);
kneeMarked = *CV_GET_SEQ_ELEM( CvPoint, seqHolesEnd, 1 );
toeMarked = *CV_GET_SEQ_ELEM( CvPoint, seqHolesEnd, 2 );
}
/* kalman */
// kalman
measurement_pt = kneeMarked;
//cvMatMulAdd(kalman->measurement_matrix, x_k,z_k,z_k);
// crossPoint(frame_copy, cvPoint(measurement_pt.x -20, measurement_pt.y), YELLOW, BIG); //works
// crossPoint(frame_copy, cvPoint(prediction_pt.x +20, prediction_pt.y), WHITE, BIG); //0,0
/* /kalman */
// /kalman