commit d2ff5e457192eb3b3e01ce90b00259dd01607e5b
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 3 10:21:41 2022 +0100
Encoder capture params mass on gravitatory, inertia on inertial, on one row
glade/app1.glade | 225 +++++++++++++++++++++++----------------------
src/gui/app1/chronojump.cs | 8 +-
src/gui/app1/encoder.cs | 12 +--
3 files changed, 126 insertions(+), 119 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index bf2d2b2d9..28ff4c158 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -26243,6 +26243,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34943,17 +34949,86 @@ then click this button.</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox" id="vbox256">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkLabel" id="label58">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Phase</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="label61">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Laterality</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkVBox" id="vbox43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox"
id="vbox_encoder_exercise_mass">
+ <widget class="GtkLabel"
id="label_encoder_exercise_mass">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <property name="homogeneous">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Mass</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="hbox47">
+ <widget class="GtkLabel"
id="label_encoder_exercise_inertia">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Inertia M.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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="GtkVBox" id="vbox74">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_exercise_mass">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
@@ -34999,7 +35074,7 @@ then click this button.</property>
<widget class="GtkHBox"
id="hbox_encoder_capture_extra_mass_raspberry">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkHBox" id="hbox45">
<property name="visible">True</property>
@@ -35045,11 +35120,16 @@ then click this button.</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
+ <widget class="GtkHBox" id="hbox219">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
<widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_10">
<property name="label">-10</property>
<property name="width_request">50</property>
@@ -35064,7 +35144,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>
@@ -35082,7 +35162,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>
@@ -35100,7 +35180,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>
@@ -35118,7 +35198,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>
</widget>
@@ -35130,16 +35210,16 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox49">
<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="hbox66">
<property name="visible">True</property>
@@ -35259,31 +35339,28 @@ then click this button.</property>
<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="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_encoder_exercise_inertia">
+ <widget class="GtkHBox"
id="hbox_encoder_exercise_inertia">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <property name="homogeneous">True</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkHBox"
id="hbox_encoder_anchorage_diameter">
<property name="visible">True</property>
@@ -35329,13 +35406,13 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox126">
+ <widget class="GtkHBox" id="hbox157">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -35479,7 +35556,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox157">
+ <widget class="GtkHBox" id="hbox220">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
@@ -35518,13 +35595,6 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">False</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>
@@ -35532,39 +35602,6 @@ then click this button.</property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox74">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel"
id="label_encoder_exercise_mass">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Mass</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="label_encoder_exercise_inertia">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Inertia M.</property>
- </widget>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
@@ -35572,47 +35609,11 @@ then click this button.</property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox256">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">16</property>
- <child>
- <widget class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Phase</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="label61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Laterality</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
</widget>
@@ -35986,8 +35987,8 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -42138,6 +42139,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 4800768c4..01e8c8322 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3725,9 +3725,9 @@ public partial class ChronoJumpWindow
//TODO: show also info on the top
label_button_encoder_select.Text = Catalog.GetString("Configure gravitatory
encoder");
label_encoder_exercise_mass.Visible = true;
- vbox_encoder_exercise_mass.Visible = true;
+ hbox_encoder_exercise_mass.Visible = true;
label_encoder_exercise_inertia.Visible = false;
- vbox_encoder_exercise_inertia.Visible = false;
+ hbox_encoder_exercise_inertia.Visible = false;
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_weight.png");
if(radio_encoder_analyze_individual_current_set.Active ||
radio_encoder_analyze_individual_current_session.Active)
@@ -3762,9 +3762,9 @@ public partial class ChronoJumpWindow
//TODO: show also info on the top
label_button_encoder_select.Text = Catalog.GetString("Configure inertial
encoder");
label_encoder_exercise_mass.Visible = false;
- vbox_encoder_exercise_mass.Visible = false;
+ hbox_encoder_exercise_mass.Visible = false;
label_encoder_exercise_inertia.Visible = true;
- vbox_encoder_exercise_inertia.Visible = true;
+ hbox_encoder_exercise_inertia.Visible = true;
radiobutton_encoder_analyze_1RM.Visible = false;
hbox_combo_encoder_analyze_1RM.Visible=false;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index f83f8b088..042f07796 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -34,9 +34,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_encoder_capture_top;
[Widget] Gtk.Label label_button_encoder_select;
[Widget] Gtk.Label label_encoder_exercise_mass;
- [Widget] Gtk.VBox vbox_encoder_exercise_mass;
+ [Widget] Gtk.HBox hbox_encoder_exercise_mass;
[Widget] Gtk.Label label_encoder_exercise_inertia;
- [Widget] Gtk.VBox vbox_encoder_exercise_inertia;
+ [Widget] Gtk.HBox hbox_encoder_exercise_inertia;
[Widget] Gtk.Button button_encoder_select;
[Widget] Gtk.SpinButton spin_encoder_extra_weight;
@@ -1978,9 +1978,9 @@ public partial class ChronoJumpWindow
notebook_encoder_top.Page = 1;
//label_button_encoder_select.Text = Catalog.GetString("Configure inertial encoder");
label_encoder_exercise_mass.Visible = false;
- vbox_encoder_exercise_mass.Visible = false;
+ hbox_encoder_exercise_mass.Visible = false;
label_encoder_exercise_inertia.Visible = true;
- vbox_encoder_exercise_inertia.Visible = true;
+ hbox_encoder_exercise_inertia.Visible = true;
if(! encoderConfigurationCurrent.list_d.IsEmpty())
{
@@ -2001,9 +2001,9 @@ public partial class ChronoJumpWindow
notebook_encoder_top.Page = 0;
//label_button_encoder_select.Text = Catalog.GetString("Configure gravitatory
encoder");
label_encoder_exercise_mass.Visible = true;
- vbox_encoder_exercise_mass.Visible = true;
+ hbox_encoder_exercise_mass.Visible = true;
label_encoder_exercise_inertia.Visible = false;
- vbox_encoder_exercise_inertia.Visible = false;
+ hbox_encoder_exercise_inertia.Visible = false;
}
}