[chronojump] Chronojump profile and bilateral profile added
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Chronojump profile and bilateral profile added
- Date: Sun, 19 Oct 2014 05:09:34 +0000 (UTC)
commit 820d9a2f607c4e0892c3be730511903b97861cb4
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Oct 18 18:58:49 2014 -0300
Chronojump profile and bilateral profile added
glade/chronojump.glade | 4 ++--
src/sqlite/executeAuto.cs | 21 +++++++++++++++++----
src/sqlite/main.cs | 17 ++++++++++++++++-
3 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index ce2cacb..9831d5f 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -24964,7 +24964,6 @@ comments</property>
<widget class="GtkWindow" id="execute_auto">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Automatic mode</property>
- <property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_delete_event" swapped="no"/>
@@ -25044,6 +25043,7 @@ comments</property>
<property name="shadow_type">in</property>
<child>
<widget class="GtkAlignment" id="alignment3">
+ <property name="width_request">500</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">8</property>
@@ -25055,7 +25055,7 @@ comments</property>
<property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hadjustment">0 0 404 40.400000000000006 363.60000000000002
404</property>
+ <property name="hadjustment">0 0 580 58 522 580</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
diff --git a/src/sqlite/executeAuto.cs b/src/sqlite/executeAuto.cs
index cddf2b7..6efcd32 100644
--- a/src/sqlite/executeAuto.cs
+++ b/src/sqlite/executeAuto.cs
@@ -88,11 +88,24 @@ class SqliteExecuteAuto : Sqlite
new ExecuteAutoSQL( -1, "Chronojump profile", ExecuteAuto.ModeTypes.BY_PERSONS,
"Complete profile using jumps",
new List<int> { jList.FindID("SJ"), jList.FindID("SJl"),
jList.FindID("CMJ"), jList.FindID("ABK"), jList.FindID("DJa") },
new List<int>{},
- new List<int>{} ),
+ new List<int>{}
+ ),
- //new ExecuteAutoSQL( -1, "Bilateral tests", ExecuteAuto.ModeTypes.BY_PERSONS,
"Bilateral / Unilateral measurements with jumps",
- // new List<int> {TODO: ints hereCMJ_R, CMJ_}, new List<int>{}, new
List<int>{} ),
- //TODO: add the BY_SERIES
+ new ExecuteAutoSQL( -1, "Bilateral profile by persons",
ExecuteAuto.ModeTypes.BY_PERSONS, "Bilateral / Unilateral tests",
+ new List<int> {
+ jList.FindID("slCMJright"), jList.FindID("slCMJleft"),
jList.FindID("CMJ"),
+ jList.FindID("slCMJleft"), jList.FindID("CMJ"),
jList.FindID("slCMJright"),
+ jList.FindID("CMJ"), jList.FindID("slCMJleft"),
jList.FindID("slCMJright"),
+ },
+ new List<int>{},
+ new List<int>{}
+ ),
+
+ new ExecuteAutoSQL( -1, "Bilateral profile by sets", ExecuteAuto.ModeTypes.BY_SETS,
"Bilateral / Unilateral tests",
+ new List<int> { jList.FindID("slCMJright"),
jList.FindID("slCMJleft"), jList.FindID("CMJ") },
+ new List<int> { jList.FindID("CMJ"), jList.FindID("slCMJleft"),
jList.FindID("slCMJright") },
+ new List<int> { jList.FindID("slCMJleft"), jList.FindID("CMJ"),
jList.FindID("slCMJright") }
+ )
};
foreach(ExecuteAutoSQL eaSQL in eaSQLlist) {
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 6f645cb..87572b5 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -74,7 +74,7 @@ class Sqlite
* Important, change this if there's any update to database
* Important2: if database version get numbers higher than 1, check if the comparisons with
currentVersion works ok
*/
- static string lastChronojumpDatabaseVersion = "1.14";
+ static string lastChronojumpDatabaseVersion = "1.15";
public Sqlite() {
}
@@ -1675,6 +1675,18 @@ class Sqlite
currentVersion = "1.14";
}
+ if(currentVersion == "1.14") {
+ dbcon.Open();
+
+ Log.WriteLine("added Chronojump profile and bilateral profile");
+
+ SqliteExecuteAuto.addChronojumpProfileAndBilateral();
+ SqlitePreferences.Update ("databaseVersion", "1.15", true);
+ dbcon.Close();
+
+ currentVersion = "1.15";
+ }
+
}
//if changes are made here, remember to change also in CreateTables()
@@ -1815,8 +1827,11 @@ class Sqlite
SqliteCountry.initialize();
SqliteExecuteAuto.createTableExecuteAuto();
+ SqliteExecuteAuto.addChronojumpProfileAndBilateral();
//changes [from - to - desc]
+ //1.14 - 1.15 Converted DB to 1.15 added Chronojump profile and bilateral profile
+ //1.13 - 1.14 Converted DB to 1.14 slCMJ -> slCMJleft, slCMJright
//1.12 - 1.13 Converted DB to 1.13 Added ExecuteAuto table
//1.11 - 1.12 Converted DB to 1.12 URLs from absolute to relative
//1.10 - 1.11 Converted DB to 1.11 Added option on autosave curves on capture
(all/bestmeanpower/none)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]