[chronojump] ForceSensor exercise effect of the mass is included is last option and default is "add".



commit ec6eec24d27f9d94a754803baa0480405b7a6208
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Jan 3 17:45:50 2022 +0100

    ForceSensor exercise effect of the mass is included is last option and default is "add".

 glade/force_sensor_exercise.glade | 36 ++++++++++++++++++------------------
 src/gui/forceSensorExercise.cs    |  3 ++-
 2 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/glade/force_sensor_exercise.glade b/glade/force_sensor_exercise.glade
index ec17fec54..29dd7d8f0 100644
--- a/glade/force_sensor_exercise.glade
+++ b/glade/force_sensor_exercise.glade
@@ -357,21 +357,6 @@
                         <property name="can_focus">False</property>
                         <property name="border_width">8</property>
                         <property name="spacing">12</property>
-                        <child>
-                          <widget class="GtkRadioButton" id="radio_mass_nothing">
-                            <property name="label" translatable="yes">The effect of mass is included in the 
raw data</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_radio_mass_toggled" swapped="no"/>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
                         <child>
                           <widget class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
@@ -385,7 +370,6 @@
                                 <property name="receives_default">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">radio_mass_nothing</property>
                                 <signal name="toggled" handler="on_radio_mass_toggled" swapped="no"/>
                               </widget>
                               <packing>
@@ -443,7 +427,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -454,7 +438,23 @@
                             <property name="receives_default">False</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">radio_mass_nothing</property>
+                            <property name="group">radio_mass_add</property>
+                            <signal name="toggled" handler="on_radio_mass_toggled" swapped="no"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkRadioButton" id="radio_mass_nothing">
+                            <property name="label" translatable="yes">The effect of mass is included in the 
raw data</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radio_mass_add</property>
                             <signal name="toggled" handler="on_radio_mass_toggled" swapped="no"/>
                           </widget>
                           <packing>
diff --git a/src/gui/forceSensorExercise.cs b/src/gui/forceSensorExercise.cs
index 188b72168..6965645ef 100644
--- a/src/gui/forceSensorExercise.cs
+++ b/src/gui/forceSensorExercise.cs
@@ -410,7 +410,8 @@ public class ForceSensorExerciseWindow
                else if(o == Options.MASS_SUBTRACT)
                        str = Catalog.GetString("In some cases the weight of the mass is supported by the 
sensor but it is not a force that the subject is exerting. In this case, the sensor will be tared before 
starting the test.");
                else if(o == Options.MASS_NOTHING)
-                       str = Catalog.GetString("In some cases the weight is transmitted to the sensor and it 
is also supported by the measured limb. If the effect of the mass is not significant, use this option also.");
+                       str = Catalog.GetString("In some cases the weight is transmitted to the sensor and it 
is also supported by the measured limb. If the effect of the mass is not significant, use this option also.") 
+
+                               " " + "This configuration is the same than raw data"; //TODO: translate last 
sentence
                else if(o == Options.REPETITIONS_PREFS)
                        str = Catalog.GetString("If user changes values on preferences, these values will 
automatically change.");
                else if(o == Options.REPETITIONS_NO_PREFS)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]