[chronojump] ForceSensor show elastic/not elastic on top
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] ForceSensor show elastic/not elastic on top
- Date: Mon, 2 Aug 2021 11:05:27 +0000 (UTC)
commit 8fa28a2b02ea1cdee497d8f7f8a87251931c1bae
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Aug 2 13:05:04 2021 +0200
ForceSensor show elastic/not elastic on top
glade/app1.glade | 5 +++--
src/gui/app1/chronojump.cs | 4 ++--
src/gui/app1/contactsExercise.cs | 15 ---------------
src/gui/app1/forceSensor.cs | 2 ++
4 files changed, 7 insertions(+), 19 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 03931f553..8fb865476 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -6051,6 +6051,7 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox446">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkLabel"
id="label_contacts_exercise_selected_options">
<property name="visible">True</property>
@@ -6058,8 +6059,8 @@ EncoderInertialCapture</property>
<property name="xalign">0</property>
</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>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 56f380669..7a1e855ff 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3758,12 +3758,12 @@ public partial class ChronoJumpWindow
notebook_capture_graph_table.CurrentPage = 1; //"Show table"
notebook_capture_graph_table.ShowTabs = false;
- //setLabelContactsExerciseSelected(m);
+ setLabelContactsExerciseSelected(m);
//better use the followin so we will have the Elastic/not elastic display on mode
change
on_combo_force_sensor_exercise_changed (new object(), new EventArgs ());
//setLabelContactsExerciseSelectedOptionsForceSensor();
- label_contacts_exercise_selected_options.Visible = false;
+ label_contacts_exercise_selected_options.Visible = true;
image_top_laterality_contacts.Visible = true;
setForceSensorLateralityPixbuf();
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index a319d6743..fcdf1a59a 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -248,21 +248,6 @@ public partial class ChronoJumpWindow
label_contacts_exercise_selected_options.Text = name;
}
- /* Now just showing laterality icon with setForceSensorLateralityPixbuf()
- private void setLabelContactsExerciseSelectedOptionsForceSensor()
- {
- string name = Catalog.GetString("Laterality:");
- if(radio_force_sensor_laterality_l.Active)
- name += " " + Catalog.GetString("Left");
- else if(radio_force_sensor_laterality_r.Active)
- name += " " + Catalog.GetString("Right");
- else //if(radio_force_sensor_laterality_both.Active) //default to both
- name += " " + Catalog.GetString("Both");
-
- label_contacts_exercise_selected_options.Text = name;
- }
- */
-
private void on_button_combo_select_contacts_top_left_clicked (object o, EventArgs args)
{
if(current_mode == Constants.Modes.JUMPSSIMPLE)
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 7bb0c97af..ee4d9cc18 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -3088,11 +3088,13 @@ LogB.Information(" fs R ");
setStiffnessButtonLabel(stiffness);
frame_force_sensor_elastic.Visible = true;
changeTestImage("", "", "FORCESENSOR_ELASTIC");
+ label_contacts_exercise_selected_options.Text = Catalog.GetString("Elastic");
} else {
label_button_force_sensor_stiffness.Text = "0";
frame_force_sensor_elastic.Visible = false;
changeTestImage("", "", "FORCESENSOR_NOT_ELASTIC");
image_button_force_sensor_stiffness_problem.Visible = false;
+ label_contacts_exercise_selected_options.Text = Catalog.GetString("Not elastic");
}
string isElasticStr = " (" + Catalog.GetString("Elastic") + ")";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]