[chronojump] new test Gesell-DBT test new db: 0.69
- From: Xavier de Blas <xaviblas src gnome org>
- To: svn-commits-list gnome org
- Subject: [chronojump] new test Gesell-DBT test new db: 0.69
- Date: Thu, 30 Apr 2009 07:58:33 -0400 (EDT)
commit c135e3ad956aaeb600b7382313fcbb5d0c98c9af
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 30 13:57:28 2009 +0200
new test Gesell-DBT test new db: 0.69
new runType allows to put decimals at distance (fixes bug)
---
Makefile | 1 +
build/data/chronojump.prg | Bin 2908672 -> 2928128 bytes
build/data/chronojump_mini.prg | Bin 39936 -> 39936 bytes
changelog.txt | 4 +
glade/chronojump.glade | 390 ++++++++++++++++++++++++++--------------
images/gesell_dbt.png | Bin 0 -> 7009 bytes
images/mini/gesell_dbt.png | Bin 0 -> 3320 bytes
src/execute/run.cs | 3 +-
src/gui/chronojump.cs | 6 +
src/gui/event.cs | 15 ++
src/gui/jump.cs | 2 +
src/gui/multiChronopic.cs | 1 +
src/gui/pulse.cs | 1 +
src/gui/reactionTime.cs | 1 +
src/gui/run.cs | 29 +++-
src/gui/runType.cs | 3 +
src/runType.cs | 43 +++++
src/sqlite/main.cs | 19 ++-
src/sqlite/runType.cs | 5 +-
src/treeViewMultiChronopic.cs | 8 -
20 files changed, 387 insertions(+), 144 deletions(-)
diff --git a/Makefile b/Makefile
index a7bd02e..26151f8 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,7 @@ RESOURCES_IMAGES = -resource:images/mini/no_image.png,mini/no_image.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/margaria.png,margaria.png -resource:images/mini/margaria.png,mini/margaria.png \
+ -resource:images/gesell_dbt.png,gesell_dbt.png -resource:images/mini/gesell_dbt.png,mini/gesell_dbt.png \
-resource:images/pulse_free.png,pulse_free.png -resource:images/mini/pulse_free.png,mini/pulse_free.png \
-resource:images/pulse_custom.png,pulse_custom.png -resource:images/mini/pulse_custom.png,mini/pulse_custom.png \
-resource:images/mtgug.png,mtgug.png -resource:images/mini/mtgug.png,mini/mtgug.png \
diff --git a/build/data/chronojump.prg b/build/data/chronojump.prg
index 5cf92d3..18a8860 100755
Binary files a/build/data/chronojump.prg and b/build/data/chronojump.prg differ
diff --git a/build/data/chronojump_mini.prg b/build/data/chronojump_mini.prg
index 8a7972c..ff08a3a 100755
Binary files a/build/data/chronojump_mini.prg and b/build/data/chronojump_mini.prg differ
diff --git a/changelog.txt b/changelog.txt
index aaa0fe9..a852ee1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
CHANGELOG.txt
+30 apr 2009
+ new test Gesell-DBT test new db: 0.69
+ new runType allows to put decimals at distance (fixes bug)
+
28 apr 2009
0.8.3.2
multiChronopic:
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 75b77eb..e778b25 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6857,15 +6857,15 @@ options</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">100 0 99999 1 10 10</property>
</widget>
<packing>
- <property name="padding">18</property>
+ <property name="padding">8</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
@@ -6895,6 +6895,31 @@ options</property>
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label_decimal">
+ <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>
@@ -8616,7 +8641,7 @@ suitable for agility tests)</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="image4234">
+ <widget class="GtkImage" id="image4269">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -8637,7 +8662,7 @@ suitable for agility tests)</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="image4235">
+ <widget class="GtkImage" id="image4270">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -8658,7 +8683,7 @@ suitable for agility tests)</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="image4236">
+ <widget class="GtkImage" id="image4271">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -8680,7 +8705,7 @@ suitable for agility tests)</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="image4237">
+ <widget class="GtkImage" id="image4272">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -8708,7 +8733,7 @@ suitable for agility tests)</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="image4238">
+ <widget class="GtkImage" id="image4273">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
@@ -8743,7 +8768,7 @@ suitable for agility tests)</property>
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image4239">
+ <widget class="GtkImage" id="image4274">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
@@ -8811,7 +8836,7 @@ suitable for agility tests)</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="image4240">
+ <widget class="GtkImage" id="image4275">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -8838,7 +8863,7 @@ suitable for agility tests)</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="image4241">
+ <widget class="GtkImage" id="image4276">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon_size">1</property>
@@ -8872,7 +8897,7 @@ suitable for agility tests)</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="image4242">
+ <widget class="GtkImage" id="image4277">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -8893,7 +8918,7 @@ suitable for agility tests)</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="image4243">
+ <widget class="GtkImage" id="image4278">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -8920,7 +8945,7 @@ suitable for agility tests)</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="image4244">
+ <widget class="GtkImage" id="image4279">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -8941,7 +8966,7 @@ suitable for agility tests)</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="image4245">
+ <widget class="GtkImage" id="image4280">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -8968,7 +8993,7 @@ suitable for agility tests)</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="image4246">
+ <widget class="GtkImage" id="image4281">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -8989,7 +9014,7 @@ suitable for agility tests)</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="image4247">
+ <widget class="GtkImage" id="image4282">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
@@ -9016,7 +9041,7 @@ suitable for agility tests)</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="image4248">
+ <widget class="GtkImage" id="image4283">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -9143,7 +9168,7 @@ suitable for agility tests)</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="image4249">
+ <widget class="GtkImage" id="image4284">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -9168,7 +9193,7 @@ suitable for agility tests)</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="image4250">
+ <widget class="GtkImage" id="image4285">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -9189,7 +9214,7 @@ suitable for agility tests)</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="image4251">
+ <widget class="GtkImage" id="image4286">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -9270,7 +9295,7 @@ suitable for agility tests)</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="image4252">
+ <widget class="GtkImage" id="image4287">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -9295,7 +9320,7 @@ suitable for agility tests)</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="image4253">
+ <widget class="GtkImage" id="image4288">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -9316,7 +9341,7 @@ suitable for agility tests)</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="image4254">
+ <widget class="GtkImage" id="image4289">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -9337,7 +9362,7 @@ suitable for agility tests)</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="image4255">
+ <widget class="GtkImage" id="image4290">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -9364,7 +9389,7 @@ suitable for agility tests)</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="image4256">
+ <widget class="GtkImage" id="image4291">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -9451,6 +9476,15 @@ suitable for agility tests)</property>
</child>
<child>
+ <widget class="GtkMenuItem" id="menuitem_run_gesell">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Gesell Dynamic balance test</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_normal_run_activate" last_modification_time="Wed, 29 Apr 2009 14:39:49 GMT"/>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkMenuItem" id="menuitem_run_20yard">
<property name="visible">True</property>
<property name="label" translatable="yes">20 Yard</property>
@@ -9518,7 +9552,7 @@ suitable for agility tests)</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="image4257">
+ <widget class="GtkImage" id="image4292">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -9543,7 +9577,7 @@ suitable for agility tests)</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="image4258">
+ <widget class="GtkImage" id="image4293">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -9564,7 +9598,7 @@ suitable for agility tests)</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="image4259">
+ <widget class="GtkImage" id="image4294">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -9645,7 +9679,7 @@ suitable for agility tests)</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="image4260">
+ <widget class="GtkImage" id="image4295">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -9670,7 +9704,7 @@ suitable for agility tests)</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="image4261">
+ <widget class="GtkImage" id="image4296">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -9691,7 +9725,7 @@ suitable for agility tests)</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="image4262">
+ <widget class="GtkImage" id="image4297">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -9712,7 +9746,7 @@ suitable for agility tests)</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="image4263">
+ <widget class="GtkImage" id="image4298">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -9739,7 +9773,7 @@ suitable for agility tests)</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="image4264">
+ <widget class="GtkImage" id="image4299">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -9843,7 +9877,7 @@ suitable for agility tests)</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="image4265">
+ <widget class="GtkImage" id="image4300">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -9864,7 +9898,7 @@ suitable for agility tests)</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="image4266">
+ <widget class="GtkImage" id="image4301">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -9932,7 +9966,7 @@ suitable for agility tests)</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="image4267">
+ <widget class="GtkImage" id="image4302">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
@@ -9968,7 +10002,7 @@ suitable for agility tests)</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="image4268">
+ <widget class="GtkImage" id="image4303">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>
@@ -9995,7 +10029,7 @@ suitable for agility tests)</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="image4269">
+ <widget class="GtkImage" id="image4304">
<property name="visible">True</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">1</property>
@@ -11595,7 +11629,7 @@ suitable for agility tests)</property>
<widget class="GtkTable" id="table41">
<property name="visible">True</property>
<property name="n_rows">2</property>
- <property name="n_columns">8</property>
+ <property name="n_columns">7</property>
<property name="homogeneous">False</property>
<property name="row_spacing">4</property>
<property name="column_spacing">2</property>
@@ -11777,159 +11811,190 @@ suitable for agility tests)</property>
</child>
<child>
- <widget class="GtkButton" id="button_run_more">
+ <widget class="GtkButton" id="button_run_zigzag">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">More simple runs</property>
+ <property name="tooltip" translatable="yes">ZigZag Agility test</property>
<property name="can_focus">True</property>
+ <property name="label">ZigZag</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_button_run_more_clicked" last_modification_time="Thu, 21 Apr 2005 13:51:37 GMT"/>
-
- <child>
- <widget class="GtkImage" id="image3171">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <signal name="clicked" handler="on_normal_run_activate" last_modification_time="Fri, 04 May 2007 15:53:40 GMT"/>
+ <signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
</widget>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_run_last">
+ <widget class="GtkButton" id="button_run_shuttle">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Repeat last</property>
+ <property name="tooltip" translatable="yes">Shuttle Run Agility test</property>
<property name="can_focus">True</property>
+ <property name="label">Shuttle</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_button_run_last_clicked" last_modification_time="Wed, 20 Jul 2005 09:48:37 GMT"/>
-
- <child>
- <widget class="GtkImage" id="image3172">
- <property name="visible">True</property>
- <property name="stock">gtk-redo</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <signal name="clicked" handler="on_normal_run_activate" last_modification_time="Fri, 04 May 2007 15:53:40 GMT"/>
+ <signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button22">
+ <widget class="GtkButton" id="button_run_margaria">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add run type</property>
+ <property name="tooltip">Margaria-Kalamen test</property>
<property name="can_focus">True</property>
+ <property name="label">Margaria</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_run_type_add_activate" last_modification_time="Thu, 23 Oct 2008 22:51:43 GMT"/>
-
- <child>
- <widget class="GtkImage" id="image3212">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
+ <signal name="clicked" handler="on_run_extra_activate" last_modification_time="Mon, 02 Mar 2009 15:33:22 GMT"/>
+ <signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
</widget>
<packing>
- <property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_run_zigzag">
+ <widget class="GtkHBox" id="hbox350">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">ZigZag Agility test</property>
- <property name="can_focus">True</property>
- <property name="label">ZigZag</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_normal_run_activate" last_modification_time="Fri, 04 May 2007 15:53:40 GMT"/>
- <signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="button_run_last">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Repeat last</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_button_run_last_clicked" last_modification_time="Wed, 20 Jul 2005 09:48:37 GMT"/>
+
+ <child>
+ <widget class="GtkImage" id="image3172">
+ <property name="visible">True</property>
+ <property name="stock">gtk-redo</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button22">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add run type</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_run_type_add_activate" last_modification_time="Thu, 23 Oct 2008 22:51:43 GMT"/>
+
+ <child>
+ <widget class="GtkImage" id="image3212">
+ <property name="visible">True</property>
+ <property name="stock">gtk-new</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_run_shuttle">
+ <widget class="GtkButton" id="button_run_more">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Shuttle Run Agility test</property>
+ <property name="tooltip" translatable="yes">More simple runs</property>
<property name="can_focus">True</property>
- <property name="label">Shuttle</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_normal_run_activate" last_modification_time="Fri, 04 May 2007 15:53:40 GMT"/>
- <signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
+ <signal name="clicked" handler="on_button_run_more_clicked" last_modification_time="Thu, 21 Apr 2005 13:51:37 GMT"/>
+
+ <child>
+ <widget class="GtkImage" id="image3171">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_run_margaria">
+ <widget class="GtkButton" id="button_run_gesell">
<property name="visible">True</property>
- <property name="tooltip">Margaria-Kalamen test</property>
+ <property name="tooltip" translatable="yes">ZigZag Agility test</property>
<property name="can_focus">True</property>
- <property name="label">Margaria</property>
+ <property name="label">Gesell DBT</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_run_extra_activate" last_modification_time="Mon, 02 Mar 2009 15:33:22 GMT"/>
+ <signal name="clicked" handler="on_normal_run_activate" last_modification_time="Fri, 04 May 2007 15:53:40 GMT"/>
<signal name="enter" handler="on_button_enter" last_modification_time="Wed, 02 May 2007 12:56:21 GMT"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -22006,7 +22071,7 @@ Test</b></property>
<child>
<widget class="GtkTable" id="table42">
<property name="visible">True</property>
- <property name="n_rows">14</property>
+ <property name="n_rows">15</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">2</property>
@@ -22632,8 +22697,8 @@ Test</b></property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
<property name="y_options"></property>
</packing>
</child>
@@ -22660,8 +22725,8 @@ comments</property>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -22716,6 +22781,69 @@ comments</property>
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox351">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkSpinButton" id="spin_mistakes">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 30 1 10 10</property>
+ <signal name="changed" handler="on_spin_mistakes_changed" last_modification_time="Wed, 29 Apr 2009 15:18:06 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
+ <property name="x_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_mistakes">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Mistakes</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</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
diff --git a/images/gesell_dbt.png b/images/gesell_dbt.png
new file mode 100644
index 0000000..d39e437
Binary files /dev/null and b/images/gesell_dbt.png differ
diff --git a/images/mini/gesell_dbt.png b/images/mini/gesell_dbt.png
new file mode 100644
index 0000000..1a63852
Binary files /dev/null and b/images/mini/gesell_dbt.png differ
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 9d85f65..20dec08 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -299,7 +299,8 @@ Log.WriteLine("MANAGE(3)!!!!");
double weight = SqlitePersonSession.SelectPersonWeight(personID, sessionID);
double distanceMeters = distance / 1000;
description = "P = " + Util.TrimDecimals ( (weight * 9.8 * distanceMeters / time).ToString(), pDN) + " (Watts)";
- }
+ } else if(type == "Gesell-DBT")
+ description = "0";
uniqueID = SqliteRun.Insert(false, Constants.RunTable, "NULL", personID, sessionID,
type, distance, time, description,
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 4276c91..9590a87 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -119,6 +119,7 @@ public class ChronoJumpWindow
[Widget] Gtk.Button button_run_100m;
[Widget] Gtk.Button button_run_200m;
[Widget] Gtk.Button button_run_400m;
+ [Widget] Gtk.Button button_run_gesell;
[Widget] Gtk.Button button_run_20yard;
[Widget] Gtk.Button button_run_505;
[Widget] Gtk.Button button_run_illinois;
@@ -191,6 +192,7 @@ public class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_100m;
[Widget] Gtk.MenuItem menuitem_200m;
[Widget] Gtk.MenuItem menuitem_400m;
+ [Widget] Gtk.MenuItem menuitem_run_gesell;
[Widget] Gtk.MenuItem menuitem_run_20yard;
[Widget] Gtk.MenuItem menuitem_run_505;
[Widget] Gtk.MenuItem menuitem_run_illinois;
@@ -2852,6 +2854,8 @@ Console.WriteLine("X");
currentEventType = new RunType("200m");
} else if(o == (object) button_run_400m) {
currentEventType = new RunType("400m");
+ } else if(o == (object) button_run_gesell) {
+ currentEventType = new RunType("Gesell-DBT");
} else if(o == (object) button_run_20yard) {
currentEventType = new RunType("Agility-20Yard");
} else if(o == (object) button_run_505) {
@@ -3451,6 +3455,8 @@ Console.WriteLine("X");
currentRunType = new RunType("200m");
} else if (o == (object) button_run_400m || o == (object) menuitem_400m) {
currentRunType = new RunType("400m");
+ } else if (o == (object) button_run_gesell || o == (object) menuitem_run_gesell) {
+ currentRunType = new RunType("Gesell-DBT");
} else if (o == (object) button_run_20yard || o == (object) menuitem_run_20yard) {
currentRunType = new RunType("Agility-20Yard");
} else if (o == (object) button_run_505 || o == (object) menuitem_run_505) {
diff --git a/src/gui/event.cs b/src/gui/event.cs
index 603d316..763756b 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -66,6 +66,9 @@ public class EditEventWindow
[Widget] protected Gtk.Box hbox_combo_person;
[Widget] protected Gtk.ComboBox combo_persons;
+ [Widget] protected Gtk.Label label_mistakes;
+ [Widget] protected Gtk.SpinButton spin_mistakes;
+
[Widget] protected Gtk.Entry entry_description;
//[Widget] protected Gtk.TextView textview_description;
@@ -93,6 +96,7 @@ public class EditEventWindow
protected bool showWeight;
protected bool showLimited;
protected bool showAngle;
+ protected bool showMistakes;
protected string eventBigTypeString = "a test";
protected bool headerShowDecimal = true;
@@ -139,6 +143,7 @@ public class EditEventWindow
showWeight = true;
showLimited = true;
showAngle = true;
+ showMistakes = false;
label_simulated.Hide();
}
@@ -216,6 +221,12 @@ public class EditEventWindow
label_angle_title.Hide();
entry_angle_value.Hide();
}
+
+ if(! showMistakes) {
+ label_mistakes.Hide();
+ spin_mistakes.Hide();
+ }
+
//also remove new line for old descriptions that used a textview
string temp = Util.RemoveTildeAndColonAndDot(myEvent.Description);
@@ -415,6 +426,10 @@ public class EditEventWindow
} else
button_accept.Sensitive = false;
}
+
+ protected virtual void on_spin_mistakes_changed (object o, EventArgs args) {
+ }
+
private void on_entry_description_changed (object o, EventArgs args) {
entry_description.Text = Util.RemoveTildeAndColonAndDot(entry_description.Text.ToString());
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 20dc83a..61b60f9 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -90,6 +90,7 @@ public class EditJumpWindow : EditEventWindow
showWeight = true;
showLimited = false;
showAngle = true;
+ showMistakes = false;
if(weightPercentPreferred)
label_weight_title.Text = label_weight_title.Text.ToString() + " %";
@@ -312,6 +313,7 @@ public class EditJumpRjWindow : EditJumpWindow
showSpeed = false;
showWeight = true;
showLimited = true;
+ showMistakes = false;
if(weightPercentPreferred)
label_weight_title.Text = label_weight_title.Text.ToString() + " %";
diff --git a/src/gui/multiChronopic.cs b/src/gui/multiChronopic.cs
index 5bb30be..f5042cb 100644
--- a/src/gui/multiChronopic.cs
+++ b/src/gui/multiChronopic.cs
@@ -78,6 +78,7 @@ public class EditMultiChronopicWindow : EditEventWindow
showSpeed = false;
showWeight = false;
showLimited = false;
+ showMistakes = false;
}
protected override void updateEvent(int eventID, int personID, string description) {
diff --git a/src/gui/pulse.cs b/src/gui/pulse.cs
index 8e1a1a9..f72af32 100644
--- a/src/gui/pulse.cs
+++ b/src/gui/pulse.cs
@@ -77,6 +77,7 @@ public class EditPulseWindow : EditEventWindow
showSpeed = false;
showWeight = false;
showLimited = false;
+ showMistakes = false;
}
protected override string [] findTypes(Event myEvent) {
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index 1dc01aa..de849c6 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -79,6 +79,7 @@ public class EditReactionTimeWindow : EditEventWindow
showSpeed = false;
showWeight = false;
showLimited = false;
+ showMistakes = false;
}
protected override string [] findTypes(Event myEvent) {
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 36b839b..9b8dfe1 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -34,6 +34,7 @@ using Mono.Unix;
public class EditRunWindow : EditEventWindow
{
static EditRunWindow EditRunWindowBox;
+ private int mistakes;
//for inheritance
protected EditRunWindow () {
@@ -61,10 +62,17 @@ public class EditRunWindow : EditEventWindow
EditRunWindowBox.initializeValues();
+ EditRunWindowBox.fillDialog (myEvent);
+
if(myEvent.Type == "Margaria")
EditRunWindowBox.entry_description.Sensitive = false;
-
- EditRunWindowBox.fillDialog (myEvent);
+ if(myEvent.Type == "Gesell-DBT") {
+ EditRunWindowBox.showMistakes = true;
+ EditRunWindowBox.combo_eventType.Sensitive=false;
+ EditRunWindowBox.entry_description.Sensitive = false;
+ EditRunWindowBox.mistakes = Convert.ToInt32(myEvent.Description);
+ EditRunWindowBox.spin_mistakes.Value = Convert.ToInt32(myEvent.Description);
+ }
EditRunWindowBox.edit_event.Show ();
@@ -81,6 +89,7 @@ public class EditRunWindow : EditEventWindow
showSpeed = true;
showWeight = false;
showLimited = false;
+ showMistakes = false;
}
protected override string [] findTypes(Event myEvent) {
@@ -137,6 +146,21 @@ public class EditRunWindow : EditEventWindow
label_speed_value.Text = Util.TrimDecimals(
Util.GetSpeed (entryDistance, entryTime, metersSecondsPreferred) , pDN);
}
+
+ protected override void on_spin_mistakes_changed (object o, EventArgs args) {
+ if(Util.IsNumber(spin_mistakes.Value.ToString(), true) && entry_time_value.Text.ToString().Length > 0) {
+ Console.WriteLine("A");
+ Console.WriteLine(entry_time_value.Text.ToString());
+ double timeWithoutMistakes = Convert.ToDouble(entry_time_value.Text.ToString()) - 2 * mistakes;
+ entry_time_value.Text = (timeWithoutMistakes + 2 * spin_mistakes.Value).ToString();
+ entryTime = entry_time_value.Text.ToString();
+
+ mistakes = Convert.ToInt32(spin_mistakes.Value);
+
+ entry_description.Text = mistakes.ToString();
+ }
+ }
+
protected override void updateEvent(int eventID, int personID, string description) {
SqliteRun.Update(eventID, UtilGtk.ComboGetActive(combo_eventType), entryDistance, entryTime, personID, description);
@@ -254,6 +278,7 @@ public class EditRunIntervalWindow : EditRunWindow
showSpeed = true;
showWeight = false;
showLimited = true;
+ showMistakes = false;
}
//this disallows loops on radio actions
diff --git a/src/gui/runType.cs b/src/gui/runType.cs
index 4e72da3..89230b2 100644
--- a/src/gui/runType.cs
+++ b/src/gui/runType.cs
@@ -47,6 +47,7 @@ public class RunTypeAddWindow
[Widget] Gtk.SpinButton spin_fixed_tracks_or_time;
[Widget] Gtk.Label label_distance;
+ [Widget] Gtk.Label label_decimal;
[Widget] Gtk.RadioButton radiobutton_dist_variable;
[Widget] Gtk.RadioButton radiobutton_dist_fixed;
[Widget] Gtk.RadioButton radiobutton_dist_different;
@@ -108,6 +109,8 @@ public class RunTypeAddWindow
button_accept.Sensitive = false;
spin_fixed_tracks_or_time.Sensitive = false;
label_distance.Text = Catalog.GetString("Distance");
+ System.Globalization.NumberFormatInfo localeInfo = new System.Globalization.NumberFormatInfo();
+ label_decimal.Text = string.Format(Catalog.GetString("\n(decimal separator: '{0}')"), localeInfo.NumberDecimalSeparator);
radiobutton_dist_different.Sensitive = false;
hbox_distance_fixed.Hide();
diff --git a/src/runType.cs b/src/runType.cs
index b6f20dc..3f03036 100644
--- a/src/runType.cs
+++ b/src/runType.cs
@@ -127,6 +127,49 @@ public class RunType : EventType
isPredefined = true;
description = Catalog.GetString("Run 2000 meters");
imageFileName = "run_simple.png";
+ } //balance
+ else if(name == "Gesell-DBT") {
+ hasIntervals = false;
+ distance = 2.5;
+ tracksLimited = false;
+ fixedValue = 0;
+ isPredefined = true;
+ imageFileName = "gesell_dbt.png";
+ description = "Gesell Dynamic Balance Test";
+ longDescription =
+ "<b>" + Catalog.GetString("Short description") + "</b>: \n" +
+ Catalog.GetString("Subjects had to walk over the bar as fast as possible.") + "\n" +
+ Catalog.GetString("From one platform to another without falling down.") + "\n" +
+ Catalog.GetString("If they touched the ground they had to continue.") + "\n" +
+ Catalog.GetString("The hands were on their waist.") + "\n" +
+ Catalog.GetString("Without shoes.") + "\n" +
+ Catalog.GetString("Every ground contact is penalized with 2 seconds.") + "\n" +
+ Catalog.GetString("The best of 2 attempts were recorded.") + "\n\n" +
+
+ "<b>" + Catalog.GetString("Gesell's Bar") + "</b>: " +
+ Catalog.GetString("Length: 2.5 m.") + "\n" +
+ Catalog.GetString("Wide: 4 cm.") + "\n\n" +
+
+ "<b>" + Catalog.GetString("Protocol") + "</b>: " +
+ Catalog.GetString("CONDITIONS: ") + "\n" +
+ "- " + Catalog.GetString("Without shoes.") + "\n" +
+ "- " + Catalog.GetString("Hands on their waist.") + "\n" +
+ "- " + Catalog.GetString("In front of a wall in order to avoid distractions.") + "\n\n" +
+ Catalog.GetString("INSTRUCTIONS AND DEMONSTRATION: ") + "\n" +
+ "- " + Catalog.GetString("You have to walk on this bar as fast as possible \'like this\', if you touch the ground just continue.") + "\n" +
+ Catalog.GetString("\'Like this\' means normal, with a foot in front of the other, not side by side.") + "\n\n" +
+
+ Catalog.GetString("SCORE: ") + "\n" +
+ "- " + Catalog.GetString("Time will start since first platform is touched, and will stop when second platform is reached.") + "\n" +
+ "- " + Catalog.GetString("Every ground contact is penalized with 2 seconds.") + "\n" +
+ "- " + Catalog.GetString("The best of 2 attempts will be recorded.") + "\n\n" +
+
+ "<b>" + Catalog.GetString("Reference:") + "</b>\n" +
+ "Cabedo, J. (2005) L'evolució de l'equilibri durant el cicle vital. En Liceu Psicològic. Accessible a http://www.liceupsicologic.org/tesis/Tesi. Pep Cabedo.pdf (Consulted Apr 30 2009).";
+ /*
+ "<b>" + Catalog.GetString("Abstract:") + "</b>\n" +
+ "http://www.revista-apunts.com/apunts.php?id_pagina=7&id_post=837&lang=en";;
+ */
} //agility
else if(name == "Agility-20Yard") {
hasIntervals = false;
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index c7318e4..a362b86 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -72,7 +72,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 = "0.68";
+ static string lastChronojumpDatabaseVersion = "0.69";
public Sqlite() {
}
@@ -873,6 +873,22 @@ class Sqlite
dbcon.Close();
currentVersion = "0.68";
}
+ if(currentVersion == "0.68") {
+ dbcon.Open();
+
+ RunType type = new RunType();
+ type.Name = "Gesell-DBT";
+ type.Distance = 2.5;
+ type.Description = "Gesell Dynamic Balance Test";
+ SqliteRunType.Insert(type, Constants.RunTypeTable, true);
+
+ SqliteEvent.GraphLinkInsert (Constants.RunTable, "Gesell-DBT", "gesell_dbt.png", true);
+ SqlitePreferences.Update ("databaseVersion", "0.69", true);
+
+ Log.WriteLine("Converted DB to 0.69 (added Gesell-DBT test)");
+ dbcon.Close();
+ currentVersion = "0.69";
+ }
}
@@ -997,6 +1013,7 @@ class Sqlite
SqliteCountry.initialize();
//changes [from - to - desc]
+ //0.68 - 0.69 added Gesell-DBT test
//0.67 - 0.68 added multiChronopic tests table
//0.66 - 0.67 added TakeOff jumps
//0.65 - 0.66 added run analysis (JumpRj test (masked as run interval))
diff --git a/src/sqlite/runType.cs b/src/sqlite/runType.cs
index 204d765..f2ce74f 100644
--- a/src/sqlite/runType.cs
+++ b/src/sqlite/runType.cs
@@ -66,6 +66,7 @@ class SqliteRunType : Sqlite
"1000m:1000:run 1000 meters",
"2000m:2000:run 2000 meters",
"Margaria:0:Margaria-Kalamen test",
+ "Gesell-DBT:2.5:Gesell Dynamic Balance Test",
//also simple agility tests
"Agility-20Yard:18.28:20Yard Agility test",
@@ -109,7 +110,7 @@ class SqliteRunType : Sqlite
myStr[0] + "', " + myStr[1] + ", '" + //name, distance
myStr[2] + "')" ; //description
*/
- t.Name + "', " + t.Distance + ", '" + t.Description + "')" ;
+ t.Name + "', " + Util.ConvertToPoint(t.Distance) + ", '" + t.Description + "')" ;
Log.WriteLine(dbcmd.CommandText.ToString());
dbcmd.ExecuteNonQuery();
int myLast = dbcon.LastInsertRowId;
@@ -245,6 +246,7 @@ class SqliteRunType : Sqlite
SqliteEvent.GraphLinkInsert (Constants.RunTable, "Agility-Shuttle-Run", "agility_shuttle.png", true);
SqliteEvent.GraphLinkInsert (Constants.RunTable, "Agility-ZigZag", "agility_zigzag.png", true);
SqliteEvent.GraphLinkInsert (Constants.RunTable, "Margaria", "margaria.png", true);
+ SqliteEvent.GraphLinkInsert (Constants.RunTable, "Gesell-DBT", "gesell_dbt.png", true);
}
@@ -442,6 +444,7 @@ class SqliteRunIntervalType : SqliteRunType
SqliteEvent.GraphLinkInsert (Constants.RunIntervalTable, "20m10times", "run_interval.png", true);
SqliteEvent.GraphLinkInsert (Constants.RunIntervalTable, "7m30seconds", "run_interval.png", true);
SqliteEvent.GraphLinkInsert (Constants.RunIntervalTable, "20m endurance", "run_interval.png", true);
+ SqliteEvent.GraphLinkInsert (Constants.RunIntervalTable, "MTGUG", "mtgug.png", true);
}
diff --git a/src/treeViewMultiChronopic.cs b/src/treeViewMultiChronopic.cs
index 2742bc9..8ae9683 100644
--- a/src/treeViewMultiChronopic.cs
+++ b/src/treeViewMultiChronopic.cs
@@ -34,14 +34,6 @@ public class TreeViewMultiChronopic : TreeViewEvent
{
}
-/*
- //session is not created or loaded yet, graph multiChronopic treeview with columns for two chronopics
- public TreeViewMultiChronopic (Gtk.TreeView treeview, int newPrefsDigitsNumber, ExpandStates expandState)
- {
- TreeViewMultiChronopic (treeview, newPrefsDigitsNumber, expandState, 2);
- }
- */
-
//session is created or loaded, we know maxCPs will be written
public TreeViewMultiChronopic (Gtk.TreeView treeview, int newPrefsDigitsNumber, ExpandStates expandState, int maxCPs)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
