commit 48f0d7856191dfd8dc67157a5c3815f0c810863c
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Sep 12 18:43:58 2020 +0200
Encoder analyze Mode moved to right and other improvements
glade/app1.glade | 350 ++++++++++++++++++++++++++++--------------------
src/gui/app1/encoder.cs | 14 +-
2 files changed, 209 insertions(+), 155 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index af5cd390..c4ca4f2a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -30861,45 +30861,44 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment33">
+ <widget class="GtkTable"
id="table_encoder_analyze_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">8</property>
<child>
- <widget class="GtkTable"
id="table_encoder_analyze_options">
+ <widget class="GtkLabel" id="label87">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label87">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Data:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Data:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_signal_or_curves">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_signal_or_curves">
+ <widget class="GtkHBox" id="hbox173">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox173">
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_current_signal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_current_signal">
+ <widget class="GtkHBox" id="hbox83">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkLabel"
id="label_encoder_analyze_current_signal">
<property name="visible">True</property>
@@ -30913,10 +30912,6 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox83">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
<widget class="GtkButton"
id="button_encoder_load_signal_at_analyze">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -30987,14 +30982,14 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -31041,7 +31036,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -31184,45 +31179,27 @@ then click this button.</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_monthly_change_current_session">
- <property name="label" translatable="yes">Change
current session</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_open_activate" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox45">
+ <widget class="GtkAlignment" id="alignment63">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <widget class="GtkLabel" id="label72">
+ <widget class="GtkHBox" id="hbox440">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Mode:</property>
</widget>
<packing>
@@ -31231,34 +31208,11 @@ then click this button.</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox109">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkAlignment" id="alignment54">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yscale">0.5</property>
- <property name="bottom_padding">2</property>
- <child>
- <widget class="GtkHBox" id="hbox89">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
<widget class="GtkHBox" id="hbox192">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkRadioButton"
id="radiobutton_encoder_analyze_powerbars">
<property name="visible">True</property>
@@ -31360,6 +31314,11 @@ then click this button.</property>
</packing>
</child>
<child>
+ <widget class="GtkHBox" id="hbox441">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
<widget class="GtkRadioButton"
id="radiobutton_encoder_analyze_neuromuscular_profile">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -31379,33 +31338,16 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment62">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkHBox" id="hbox92">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_analyze_help">
+ <widget class="GtkButton"
id="button_encoder_analyze_neuromuscular_help">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_encoder_analyze_help_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_encoder_analyze_neuromuscular_help_clicked" swapped="no"/>
<child>
<widget class="GtkImage" id="image24">
<property name="visible">True</property>
@@ -31418,9 +31360,86 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_monthly_change_current_session">
+ <property name="label" translatable="yes">Change
current session</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_open_activate" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label72">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Options:</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox109">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox92">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkCheckButton"
id="check_encoder_analyze_eccon_together">
<property name="visible">True</property>
@@ -31466,7 +31485,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -31562,7 +31581,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -31602,7 +31621,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -31639,7 +31658,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -31654,7 +31673,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -31667,7 +31686,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -31679,7 +31698,7 @@ then click this button.</property>
<widget class="GtkHBox"
id="hbox_encoder_analyze_show_powerbars">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label297">
<property name="visible">True</property>
@@ -31720,15 +31739,38 @@ then click this button.</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Show
range</property>
<property name="draw_indicator">False</property>
<child>
+ <widget class="GtkHBox" id="hbox89">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
<widget class="GtkImage"
id="image_encoder_analyze_range">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Range</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -31743,15 +31785,38 @@ then click this button.</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Show
Time to Peak Power</property>
<property name="draw_indicator">False</property>
<child>
+ <widget class="GtkHBox" id="hbox442">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
<widget class="GtkImage"
id="image_encoder_analyze_time_to_pp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Time
to Peak Power</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -31798,7 +31863,7 @@ then click this button.</property>
<widget class="GtkLabel" id="label344">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Options</property>
+ <property name="label">More options</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -31871,6 +31936,7 @@ then click this button.</property>
</child>
<child>
<widget class="GtkLabel"
id="label_encoder_analyze_selected">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Single
repetition</property>
</widget>
@@ -31894,6 +31960,7 @@ then click this button.</property>
<property name="spacing">8</property>
<child>
<widget class="GtkLabel" id="label343">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Show:</property>
</widget>
@@ -32028,7 +32095,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">7</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -32041,29 +32108,18 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">7</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox102">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox102">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -32181,28 +32237,26 @@ then click this button.</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
- </packing>
- </child>
- </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>
</packing>
</child>
</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>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 44f62481..ad653bba 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -264,7 +264,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_combo_encoder_analyze_weights;
[Widget] Gtk.ComboBox combo_encoder_analyze_weights;
- [Widget] Gtk.Button button_encoder_analyze_help;
+ [Widget] Gtk.Button button_encoder_analyze_neuromuscular_help;
[Widget] Gtk.CheckButton check_encoder_analyze_eccon_together;
@@ -3592,7 +3592,7 @@ public partial class ChronoJumpWindow
check_encoder_analyze_eccon_together.Sensitive=true;
block_check_encoder_analyze_eccon_together_if_needed();
- button_encoder_analyze_help.Visible = false;
+ button_encoder_analyze_neuromuscular_help.Visible = false;
label_encoder_analyze_side_max.Visible = false;
//restore 1RM Bench Press sensitiveness
@@ -3619,7 +3619,7 @@ public partial class ChronoJumpWindow
//done here:
on_combo_encoder_analyze_cross_changed (obj, args);
- button_encoder_analyze_help.Visible = false;
+ button_encoder_analyze_neuromuscular_help.Visible = false;
label_encoder_analyze_side_max.Visible = false;
encoderButtonsSensitive(encoderSensEnumStored);
@@ -3643,7 +3643,7 @@ public partial class ChronoJumpWindow
//done here:
on_combo_encoder_analyze_1RM_changed (obj, args);
- button_encoder_analyze_help.Visible = false;
+ button_encoder_analyze_neuromuscular_help.Visible = false;
label_encoder_analyze_side_max.Visible = false;
encoderButtonsSensitive(encoderSensEnumStored);
@@ -3665,7 +3665,7 @@ public partial class ChronoJumpWindow
check_encoder_analyze_eccon_together.Sensitive=false;
check_encoder_analyze_eccon_together.Active = false;
- button_encoder_analyze_help.Visible = true;
+ button_encoder_analyze_neuromuscular_help.Visible = true;
label_encoder_analyze_side_max.Visible = false;
check_encoder_analyze_mean_or_max.Sensitive = false;
@@ -3693,7 +3693,7 @@ public partial class ChronoJumpWindow
check_encoder_analyze_eccon_together.Sensitive=false;
check_encoder_analyze_eccon_together.Active = true;
- button_encoder_analyze_help.Visible = false;
+ button_encoder_analyze_neuromuscular_help.Visible = false;
label_encoder_analyze_side_max.Visible = false;
//restore 1RM Bench Press sensitiveness
@@ -3829,7 +3829,7 @@ public partial class ChronoJumpWindow
}
- private void on_button_encoder_analyze_help_clicked (object obj, EventArgs args) {
+ private void on_button_encoder_analyze_neuromuscular_help_clicked (object obj, EventArgs args) {
//currently only active on neuromuscular profile
string str =