[chronojump] Fixed: Encoder, instantaneous analysis graphic size wrong

[Xavier de Blas <xaviblas src gnome org>]

commit a8a8513e061d955db97781a2047dcf0613180618
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sun Oct 25 21:49:03 2020 +0100

    Fixed: Encoder, instantaneous analysis graphic size wrong

 glade/app1.glade        | 22 ++++++++++++----------
 src/gui/app1/encoder.cs | 21 ++++++++-------------
 2 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 0076a033..cb7a829e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -25032,6 +25032,12 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -36027,6 +36033,12 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -36041,16 +36053,6 @@ then click this button.</property>
                                                             <property name="position">0</property>
                                                             </packing>
                                                             </child>
-                                                            <child>
-                                                            <widget class="GtkLabel" 
id="label_encoder_analyze_instant_need_click_analyze">
-                                                            <property name="can_focus">False</property>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">1</property>
-                                                            </packing>
-                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="position">1</property>
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 9d1023ae..3f3211c7 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -182,7 +182,6 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Label label_encoder_user_curves_all_num;
 
        [Widget] Gtk.VBox vbox_encoder_analyze_instant;
-       [Widget] Gtk.Label label_encoder_analyze_instant_need_click_analyze;
        [Widget] Gtk.Table table_encoder_analyze_instant;
        [Widget] Gtk.HScale hscale_encoder_analyze_a;
        [Widget] Gtk.CheckButton checkbutton_encoder_analyze_b;
@@ -508,8 +507,6 @@ public partial class ChronoJumpWindow
                vbox_encoder_signal_comment.SetSizeRequest 
(button_encoder_signal_save_comment.SizeRequest().Width, -1);
                notebook_encoder_signal_comment_rhythm_and_triggers.SetSizeRequest
                        (button_encoder_signal_save_comment.SizeRequest().Width, -1);
-
-               label_encoder_analyze_instant_need_click_analyze.Text = 
string.Format(Catalog.GetString("Click '{0}' button"), Catalog.GetString("Analyze"));
        }
 
        void on_button_encoder_select_clicked (object o, EventArgs args)
@@ -3609,6 +3606,7 @@ public partial class ChronoJumpWindow
                hbox_encoder_analyze_instantaneous.Visible=false;
                checkbutton_encoder_analyze_side_share_x.Visible = false;
                encoderSelectedAnalysis = "powerBars";
+               notebook_encoder_analyze.CurrentPage = 0;
                
                check_encoder_analyze_eccon_together.Sensitive=true;
                block_check_encoder_analyze_eccon_together_if_needed();
@@ -3633,6 +3631,7 @@ public partial class ChronoJumpWindow
                hbox_encoder_analyze_instantaneous.Visible=false;
                checkbutton_encoder_analyze_side_share_x.Visible = false;
                encoderSelectedAnalysis = "cross";
+               notebook_encoder_analyze.CurrentPage = 0;
                
                check_encoder_analyze_eccon_together.Sensitive=true;
                
@@ -3657,6 +3656,7 @@ public partial class ChronoJumpWindow
                hbox_encoder_analyze_instantaneous.Visible=false;
                checkbutton_encoder_analyze_side_share_x.Visible = false;
                encoderSelectedAnalysis = "1RM";
+               notebook_encoder_analyze.CurrentPage = 0;
                
                check_encoder_analyze_eccon_together.Sensitive=true;
                
@@ -3681,6 +3681,7 @@ public partial class ChronoJumpWindow
                hbox_encoder_analyze_instantaneous.Visible=false;
                checkbutton_encoder_analyze_side_share_x.Visible = false;
                encoderSelectedAnalysis = "neuromuscularProfile";
+               notebook_encoder_analyze.CurrentPage = 0;
                
                //separated, mandatory
                check_encoder_analyze_eccon_together.Sensitive=false;
@@ -3709,6 +3710,8 @@ public partial class ChronoJumpWindow
                hbox_encoder_analyze_instantaneous.Visible=true;
                //checkbutton_encoder_analyze_side_share_x.Visible = false; //defined in "4 radiobuttons"
                encoderSelectedAnalysis = "single";
+notebook_encoder_analyze.CurrentPage = 1;
+vbox_encoder_analyze_instant.Visible = true;
 
                //together, mandatory
                check_encoder_analyze_eccon_together.Sensitive=false;
@@ -5070,7 +5073,6 @@ public partial class ChronoJumpWindow
                image_encoder_capture.Sensitive = false;
                image_encoder_analyze.Sensitive = false;
                vbox_encoder_analyze_instant.Visible = false; //play with Visible instead of Sensitive 
because with Sensitive the pixmap is fully shown
-               label_encoder_analyze_instant_need_click_analyze.Visible = true;
                treeview_encoder_analyze_curves.Sensitive = false;
 
                button_encoder_analyze_image_save.Sensitive = false;
@@ -5846,7 +5848,6 @@ public partial class ChronoJumpWindow
                                encoderButtonsSensitive(encoderSensEnum.PROCESSINGR);
                        }
                } else { //encoderActions.ANALYZE
-                       
                        //the -5 is because image is inside (is smaller than) viewport
                        image_encoder_width = UtilGtk.WidgetWidth(scrolledwindow_image_encoder_analyze)-5;
                        if(image_encoder_width < 100)
@@ -6902,7 +6903,6 @@ public partial class ChronoJumpWindow
                        //analyze_image_save only has not to be sensitive now because capture graph will be 
saved
                        image_encoder_analyze.Sensitive = false;
                        vbox_encoder_analyze_instant.Visible = false; //play with Visible instead of 
Sensitive because with Sensitive the pixmap is fully shown
-                       label_encoder_analyze_instant_need_click_analyze.Visible = true;
 
                        button_encoder_analyze_image_save.Sensitive = false;
                        button_encoder_analyze_image_compujump_send_email.Sensitive = false;
@@ -6945,12 +6945,9 @@ public partial class ChronoJumpWindow
 
                                        drawingarea_encoder_analyze_instant.QueueDraw(); //will fire 
ExposeEvent
 
-               vbox_encoder_analyze_instant.Visible = true;
-               label_encoder_analyze_instant_need_click_analyze.Visible = false;
-                                       
-                                       button_encoder_analyze_AB_save.Visible = 
checkbutton_encoder_analyze_b.Active;
+                                       vbox_encoder_analyze_instant.Visible = true;
 
-                                       notebook_encoder_analyze.CurrentPage = 1;
+                                       button_encoder_analyze_AB_save.Visible = 
checkbutton_encoder_analyze_b.Active;
                                } else {
                                        //maybe image is still not readable
                                        image_encoder_analyze = UtilGtk.OpenImageSafe(
@@ -6958,8 +6955,6 @@ public partial class ChronoJumpWindow
                                                        image_encoder_analyze);
                                        
                                        button_encoder_analyze_AB_save.Visible = false;
-                                       
-                                       notebook_encoder_analyze.CurrentPage = 0;
                                }
 
                                encoder_pulsebar_analyze.Text = "";