[chronojump] force sensor analyze main options inverted. NEEDTESTS WIN & MAC

[Xavier de Blas <xaviblas src gnome org>]

commit b4ec07560d7be5f84f0206aff7950f350d18f14e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Mar 22 19:04:06 2019 +0100

    force sensor analyze main options inverted. NEEDTESTS WIN & MAC

 glade/app1.glade              | 26 +++++++++++++++++++-------
 src/gui/forceSensor.cs        |  1 +
 src/gui/forceSensorAnalyze.cs |  3 +++
 3 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8de2f515..9db9a077 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1878,6 +1878,9 @@
                                                             <placeholder/>
                                                             </child>
                                                             <child>
+                                                            <placeholder/>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkLabel" 
id="label_start_selector_jumps">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -17890,14 +17893,14 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkRadioButton" 
id="radiobutton_force_sensor_analyze_automatic">
-                                                            <property name="label" 
translatable="yes">Automatic</property>
+                                                            <widget class="GtkRadioButton" 
id="radiobutton_force_sensor_analyze_manual">
+                                                            <property name="label" 
translatable="yes">General analysis</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property 
name="receives_default">False</property>
                                                             <property name="active">True</property>
                                                             <property name="draw_indicator">True</property>
-                                                            <signal name="toggled" 
handler="on_radiobutton_force_sensor_analyze_automatic_toggled" swapped="no"/>
+                                                            <signal name="toggled" 
handler="on_radiobutton_force_sensor_analyze_manual_toggled" swapped="no"/>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -17906,15 +17909,15 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkRadioButton" 
id="radiobutton_force_sensor_analyze_manual">
-                                                            <property name="label" 
translatable="yes">Manual</property>
+                                                            <widget class="GtkRadioButton" 
id="radiobutton_force_sensor_analyze_automatic">
+                                                            <property name="label" translatable="yes">RFD 
Automatic</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property 
name="receives_default">False</property>
                                                             <property name="active">True</property>
                                                             <property name="draw_indicator">True</property>
-                                                            <property 
name="group">radiobutton_force_sensor_analyze_automatic</property>
-                                                            <signal name="toggled" 
handler="on_radiobutton_force_sensor_analyze_manual_toggled" swapped="no"/>
+                                                            <property 
name="group">radiobutton_force_sensor_analyze_manual</property>
+                                                            <signal name="toggled" 
handler="on_radiobutton_force_sensor_analyze_automatic_toggled" swapped="no"/>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -20651,6 +20654,12 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -29238,6 +29247,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 8e808bb9..6c4492df 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -137,6 +137,7 @@ public partial class ChronoJumpWindow
 
        private void initForceSensor ()
        {
+               notebook_force_sensor_analyze.CurrentPage = 1;  //start on 1: force_general_analysis
                createForceExerciseCombo();
                createForceAnalyzeCombos();
                setRFDValues();
diff --git a/src/gui/forceSensorAnalyze.cs b/src/gui/forceSensorAnalyze.cs
index 62e63b39..596e81a8 100644
--- a/src/gui/forceSensorAnalyze.cs
+++ b/src/gui/forceSensorAnalyze.cs
@@ -610,6 +610,9 @@ public partial class ChronoJumpWindow
                if(force_sensor_ai_drawingarea == null)
                        return;
 
+               force_sensor_ai_drawingareaShown = true;
+               forceSensorDoGraphAI();
+
                Gdk.EventConfigure ev = args.Event;
                Gdk.Window window = ev.Window;