commit baf61de29636d4000d8f2755bd6fd5bf8ac08f99
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 1 10:51:32 2021 +0100
force sensor rfd model graph now has bigger space (moved some notebooks)
glade/app1.glade | 467 +++++++++++++++----------------------
src/gui/app1/forceSensor.cs | 16 +-
src/gui/app1/forceSensorAnalyze.cs | 19 +-
3 files changed, 204 insertions(+), 298 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 64dcb553..8fe0edb6 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -21397,12 +21397,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkNotebook"
id="notebook_force_sensor_analyze_sliders_buttons_back">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
<widget class="GtkHBox"
id="hbox_force_sensor_analyze_ai_sliders_and_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -22098,66 +22092,6 @@ Concentric</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label368">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
1</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox248">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox"
id="hbox_force_sensor_analyze_back_to_signal">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_back_to_signal">
- <property name="label"
translatable="yes">Back</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_analyze_back_to_signal_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label597">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
2</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -22165,196 +22099,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_force_sensor_analyze">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkHBox" id="hbox_force_rfd">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkVBox" id="vbox75">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkLabel"
id="label_force_sensor_analyze">
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook"
id="notebook_force_analyze_automatic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkHBox" id="hbox231">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkViewport"
id="viewport_force_sensor_graph">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkVBox" id="vbox113">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_graph">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox109">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_image_save_rfd_auto">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Save
image</property>
- <signal name="clicked"
handler="on_button_force_sensor_image_save_rfd_auto_clicked" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox114">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_forcesensor_analyze_save_rfd_auto">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_forcesensor_analyze_image_save2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label307">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">signal graph</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label308">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">options</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label111">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">automatic</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_force_general_analysis">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -24071,6 +23815,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24436,37 +24183,200 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel" id="label301">
+ <widget class="GtkLabel" id="label588">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">manual</property>
+ <property name="label">individual current set
signal</property>
</widget>
<packing>
- <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox_force_rfd">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_force_sensor_analyze_back_to_signal">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_analyze_back_to_signal">
+ <property name="label"
translatable="yes">Back</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_back_to_signal_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
</widget>
<packing>
<property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_force_sensor_analyze">
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox231">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport"
id="viewport_force_sensor_graph">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkVBox" id="vbox113">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_graph">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label588">
+ <widget class="GtkVBox" id="vbox109">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">individual current
set</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_image_save_rfd_auto">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Save
image</property>
+ <signal name="clicked"
handler="on_button_force_sensor_image_save_rfd_auto_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox114">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_forcesensor_analyze_save_rfd_auto">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_forcesensor_analyze_image_save2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label316">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">individual current set
model</property>
</widget>
<packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -24718,7 +24628,7 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -24728,7 +24638,7 @@ Concentric</property>
<property name="label">individual/groupal
current session</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -26598,7 +26508,7 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -26608,7 +26518,7 @@ Concentric</property>
<property name="label">RFD options</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -29263,6 +29173,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -29299,18 +29221,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37661,6 +37571,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 09b48271..1099e796 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -139,7 +139,7 @@ public partial class ChronoJumpWindow
private void initForceSensor ()
{
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
createForceExerciseCombo();
createComboForceSensorCaptureOptions();
createForceAnalyzeCombos();
@@ -444,8 +444,7 @@ public partial class ChronoJumpWindow
}
else if (o == (object) button_execute_test)
{
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
- notebook_force_sensor_analyze_sliders_buttons_back.CurrentPage = 0;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
forceSensorButtonsSensitive(false);
sensitiveLastTestButtons(false);
contactsShowCaptureDoingButtons(true);
@@ -571,7 +570,7 @@ public partial class ChronoJumpWindow
button_contacts_exercise_close_and_recalculate.Sensitive = false;
textview_contacts_signal_comment.Buffer.Text = "";
- notebook_force_sensor_analyze.Sensitive = false;
+ hbox_force_general_analysis.Sensitive = false;
button_force_sensor_analyze_options_close_and_analyze.Sensitive = false;
button_force_sensor_analyze_analyze.Sensitive = false;
button_delete_last_test.Sensitive = false;
@@ -1442,7 +1441,7 @@ LogB.Information(" fs C ");
button_delete_last_test.Sensitive = true;
force_capture_drawingarea.Sensitive = true;
button_force_sensor_image_save_signal.Sensitive = true;
- notebook_force_sensor_analyze.Sensitive = true;
+ hbox_force_general_analysis.Sensitive = true;
button_force_sensor_analyze_options_close_and_analyze.Sensitive =
true;
button_force_sensor_analyze_analyze.Sensitive = true;
@@ -1943,10 +1942,9 @@ LogB.Information(" fs R ");
button_contacts_exercise_close_and_recalculate.Sensitive = true;
force_capture_drawingarea.Sensitive = true;
- notebook_force_sensor_analyze.Sensitive = true;
+ hbox_force_general_analysis.Sensitive = true;
button_force_sensor_analyze_options_close_and_analyze.Sensitive = true;
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
- notebook_force_sensor_analyze_sliders_buttons_back.CurrentPage = 0;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
}
protected void on_force_sensor_load_signal_row_play (object o, EventArgs args)
@@ -2126,7 +2124,7 @@ LogB.Information(" fs R ");
}
currentForceSensor.UpdateSQL(false);
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
}
private enum forceSensorGraphsEnum { SIGNAL, RFD }
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 02a545de..f78c5d8c 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -42,6 +42,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_analyze_groupal_current_session;
[Widget] Gtk.Notebook notebook_force_sensor_analyze_top;
+ [Widget] Gtk.HBox hbox_force_general_analysis;
[Widget] Gtk.Button button_force_sensor_analyze_load;
[Widget] Gtk.Button button_force_sensor_analyze_analyze;
[Widget] Gtk.Label label_force_sensor_analyze;
@@ -53,7 +54,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_force_sensor_analyze_AB_save;
[Widget] Gtk.CheckButton check_force_sensor_ai_chained;
[Widget] Gtk.CheckButton check_force_sensor_ai_zoom;
- [Widget] Gtk.Notebook notebook_force_sensor_analyze_sliders_buttons_back;
[Widget] Gtk.RadioButton radio_force_rfd_search_optimized_ab;
[Widget] Gtk.RadioButton radio_force_rfd_use_ab_range;
@@ -65,7 +65,6 @@ public partial class ChronoJumpWindow
//analyze options
[Widget] Gtk.HBox hbox_force_sensor_analyze_top_modes;
- [Widget] Gtk.Notebook notebook_force_sensor_analyze; //decide between automatic and manual
// [Widget] Gtk.HBox hbox_force_sensor_analyze_automatic_options;
// [Widget] Gtk.Notebook notebook_force_analyze_automatic;
[Widget] Gtk.Button button_force_sensor_analyze_options_close_and_analyze;
@@ -162,8 +161,7 @@ public partial class ChronoJumpWindow
private RepetitionMouseLimits fsAIRepetitionMouseLimits;
- private enum notebook_force_sensor_analyze_top_pages { CURRENTSET, CURRENTSESSION, AUTOMATICOPTIONS }
- private enum notebook_force_sensor_analyze_pages { AUTOMATIC, MANUAL }
+ private enum notebook_force_sensor_analyze_top_pages { CURRENTSETSIGNAL, CURRENTSETMODEL,
CURRENTSESSION, AUTOMATICOPTIONS }
/*
* analyze options -------------------------->
*/
@@ -273,7 +271,7 @@ public partial class ChronoJumpWindow
private void on_button_force_sensor_analyze_analyze_clicked (object o, EventArgs args)
{
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.AUTOMATIC);
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETMODEL);
if(! Util.FileExists(lastForceSensorFullPath))
{
@@ -281,16 +279,13 @@ public partial class ChronoJumpWindow
return;
}
- notebook_force_sensor_analyze_sliders_buttons_back.CurrentPage = 1;
-
if(lastForceSensorFullPath != null && lastForceSensorFullPath != "")
forceSensorCopyTempAndDoGraphs(forceSensorGraphsEnum.RFD);
}
private void on_button_force_sensor_analyze_back_to_signal_clicked (object o, EventArgs args)
{
- notebook_force_sensor_analyze_sliders_buttons_back.CurrentPage = 0;
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
}
private void on_radio_force_rfd_search_optimized_ab_toggled (object o, EventArgs args)
@@ -697,7 +692,7 @@ public partial class ChronoJumpWindow
private void on_radio_force_sensor_analyze_individual_current_set_toggled (object o, EventArgs args)
{
button_force_sensor_analyze_load.Visible = true;
- notebook_force_sensor_analyze_top.CurrentPage = 0;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSETSIGNAL);
label_force_sensor_export_result.Text = "";
}
private void on_radio_force_sensor_analyze_individual_current_session_toggled (object o, EventArgs
args)
@@ -709,7 +704,7 @@ public partial class ChronoJumpWindow
else
label_force_sensor_export_data.Text = "";
- notebook_force_sensor_analyze_top.CurrentPage = 1;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSESSION);
label_force_sensor_export_result.Text = "";
}
private void on_radio_force_sensor_analyze_groupal_current_session_toggled (object o, EventArgs args)
@@ -718,7 +713,7 @@ public partial class ChronoJumpWindow
label_force_sensor_export_data.Text = currentSession.Name;
- notebook_force_sensor_analyze_top.CurrentPage = 1;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.CURRENTSESSION);
label_force_sensor_export_result.Text = "";
}