[chronojump] Fixed mismatch between Force sensor analyze notebook currentSet and radio



commit cd3849d5d76f4a022e3af21fe982eb20639b4d65
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Mar 18 12:35:04 2021 +0100

    Fixed mismatch between Force sensor analyze notebook currentSet and radio

 src/gui/app1/forceSensor.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 20c90b2d..cabb81b8 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -139,7 +139,10 @@ public partial class ChronoJumpWindow
 
        private void initForceSensor ()
        {
-               notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+               //notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+               //change radio and will change also notebook:
+               radio_force_sensor_analyze_individual_current_set.Active = true;
+
                createForceExerciseCombo();
                createComboForceSensorCaptureOptions();
                createForceAnalyzeCombos();
@@ -447,7 +450,10 @@ public partial class ChronoJumpWindow
                }
                else if (o == (object) button_execute_test)
                {
-                       notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+                       //notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+                       //change radio and will change also notebook:
+                       radio_force_sensor_analyze_individual_current_set.Active = true;
+
                        forceSensorButtonsSensitive(false);
                        sensitiveLastTestButtons(false);
                        contactsShowCaptureDoingButtons(true);
@@ -1947,7 +1953,10 @@ LogB.Information(" fs R ");
                force_capture_drawingarea.Sensitive = true;
                hbox_force_general_analysis.Sensitive = true;
                button_force_sensor_analyze_options_close_and_analyze.Sensitive = true;
-               notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+
+               //notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+               //change radio and will change also notebook:
+               radio_force_sensor_analyze_individual_current_set.Active = true;
        }
 
        protected void on_force_sensor_load_signal_row_play (object o, EventArgs args)
@@ -2127,7 +2136,10 @@ LogB.Information(" fs R ");
                }
 
                currentForceSensor.UpdateSQL(false);
-               notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+
+               //notebook_force_sensor_analyze_top.CurrentPage = 
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
+               //change radio and will change also notebook:
+               radio_force_sensor_analyze_individual_current_set.Active = true;
        }
 
        private enum forceSensorGraphsEnum { SIGNAL, RFD }


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