commit e99de02d66c8f8f9285015f92913356ab50d8115
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jul 12 11:31:34 2016 +0200
Added jumps profile indexes explanations
glade/chronojump.glade | 300 +++++++++++++++++++++++++++++++++++++++++++++---
src/gui/chronojump.cs | 11 ++-
src/jumpsProfile.cs | 12 +-
3 files changed, 297 insertions(+), 26 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 54d56e5..794c2be 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12023,9 +12023,24 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox199">
+ <widget class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="button_jumps_profile_help">
+ <property name="label">Help on indexes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_jumps_profile_help_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<widget class="GtkButton"
id="button_jumps_profile_training">
<property name="label">General recommendations on
improving indexes</property>
@@ -12036,20 +12051,208 @@ on current Chronojump version.</property>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table_jumps_profile">
+ <widget class="GtkTable" id="table_jumps_profile_help">
+ <property name="can_focus">False</property>
+ <property name="n_rows">6</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label233">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><b>Maximum
Force</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label234">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><b>Explosive
Force</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label235">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><b>Elastic
Index</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label236">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><b>Arms using
Index</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label237">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><b>Reactive-reflex
Index</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label238">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ability to mobilise an external
resistance.</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label239">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Ability to mobilise the body
mass.</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label240">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Increasing of strength due to the
elastic energy accumulated during the stretch-shortening cycle.</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label241">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Increasing of strength due to arm
movement.</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label242">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Increasing of strength by
previous falling from height (reflex mechanisms activation).</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label243">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">All the definitions are related
to jumps.</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table_jumps_profile_training">
<property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">8</property>
@@ -12150,7 +12353,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label177">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><b>F.
Max</b></property>
+ <property name="label"><b>Maximum
force</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -12164,7 +12367,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label169">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><b>F.
Expl</b></property>
+ <property name="label"><b>Explosive
Force</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -12178,7 +12381,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label178">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><b>Hab.
Elast</b></property>
+ <property name="label"><b>Elastic
Hability</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -12192,7 +12395,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label186">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><b>Hab.
Arms</b></property>
+ <property name="label"><b>Arms
Hability</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -12206,7 +12409,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label190">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><b>F.
React-reflex.</b></property>
+ <property name="label"><b>Reactive-reflex
Hability</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -12305,7 +12508,8 @@ elastic bands</property>
<widget class="GtkLabel" id="label196">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Concentric, isometric</property>
+ <property name="label">Concentric
+isometric</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -12337,7 +12541,8 @@ elastic bands</property>
<widget class="GtkLabel" id="label200">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Excentric-Concentric</property>
+ <property name="label">Excentric-
+Concentric</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -12353,7 +12558,8 @@ elastic bands</property>
<widget class="GtkLabel" id="label202">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Concentric, isometric</property>
+ <property name="label">Concentric,
+isometric</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -12369,7 +12575,8 @@ elastic bands</property>
<widget class="GtkLabel" id="label203">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Excentric-Concentric</property>
+ <property name="label">Excentric-
+Concentric</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -12797,11 +13004,14 @@ low ressistance</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -17645,6 +17855,9 @@ low ressistance</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22388,6 +22601,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23612,6 +23828,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25328,6 +25547,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26101,6 +26323,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -39397,6 +39622,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42256,6 +42499,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43457,9 +43712,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -44683,6 +44935,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48793,6 +49048,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -49681,6 +49939,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -50584,6 +50845,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6f95871..78f8587 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -196,7 +196,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.DrawingArea drawingarea_jumps_profile;
[Widget] Gtk.Label label_jumps_profile_person;
- [Widget] Gtk.Table table_jumps_profile;
+ [Widget] Gtk.Table table_jumps_profile_help;
+ [Widget] Gtk.Table table_jumps_profile_training;
[Widget] Gtk.Image image_tab_jumps_profile;
@@ -6553,8 +6554,14 @@ LogB.Debug("X");
jumpsProfileDo(true);
}
+ private void on_button_jumps_profile_help_clicked (object o, EventArgs args) {
+ table_jumps_profile_training.Visible = false;
+ table_jumps_profile_help.Visible = ! table_jumps_profile_help.Visible;
+ }
+
private void on_button_jumps_profile_training_clicked (object o, EventArgs args) {
- table_jumps_profile.Visible = ! table_jumps_profile.Visible;
+ table_jumps_profile_help.Visible = false;
+ table_jumps_profile_training.Visible = ! table_jumps_profile_training.Visible;
}
diff --git a/src/jumpsProfile.cs b/src/jumpsProfile.cs
index 26f7fac..2c33f2c 100644
--- a/src/jumpsProfile.cs
+++ b/src/jumpsProfile.cs
@@ -46,27 +46,27 @@ public class JumpsProfileIndex
this.type = type;
switch(type) {
case Types.FMAX:
- Text = "% F. Maximum SJl100% / DJa";
+ Text = "% Maximum Force SJl100% / DJa";
Color = colorFromRGB(101,86,67);
break;
case Types.FEXPL:
- Text = "% F. Explosive (SJ - SJl100%) / Dja";
+ Text = "% Explosive Force (SJ - SJl100%) / Dja";
Color = colorFromRGB(209,63,58);
break;
case Types.CELAST:
- Text = "% Hab. Elastic (CMJ - SJ) / Dja";
+ Text = "% Elastic Hability (CMJ - SJ) / Dja";
Color = colorFromRGB(255,152,68);
break;
case Types.CARMS:
- Text = "% Hab. Arms (ABK - CMJ) / Dja";
+ Text = "% Arms Hability (ABK - CMJ) / Dja";
Color = colorFromRGB(141,237,78);
break;
case Types.FREACT:
- Text = "% F. Reactive-reflex (DJa - ABK) / Dja";
+ Text = "% Reactive-reflex Hability (DJa - ABK) / Dja";
Color = colorFromRGB(133,190,199);
break;
default:
- Text = "% F. Maximum SJl100% / DJa";
+ Text = "% Maximum Force SJl100% / DJa";
Color = colorFromRGB(101,86,67);
break;
}