commit 0ebf403d278ebcaec3d2deeb779367cd6077327f
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Feb 8 19:11:54 2021 +0100
force sensor analyze gui with 3 modes and moved RFD options
glade/app1.glade | 1102 ++++++++++++++++++++++--------------
src/gui/app1/forceSensor.cs | 6 +-
src/gui/app1/forceSensorAnalyze.cs | 61 +-
src/gui/app1/icons.cs | 11 +-
4 files changed, 741 insertions(+), 439 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 541600b0..be218c2c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -21039,28 +21039,51 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
- <property name="spacing">2</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkTable" id="table19">
+ <widget class="GtkHBox" id="hbox457">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">16</property>
- <property name="row_spacing">2</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_load">
+ <widget class="GtkHBox"
id="hbox_force_sensor_analyze_top_modes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkFrame" id="frame26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">3</property>
+ <property name="bottom_padding">1</property>
+ <property name="left_padding">1</property>
+ <property name="right_padding">1</property>
+ <child>
+ <widget class="GtkHBox" id="hbox458">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_force_sensor_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_contacts_capture_load_clicked" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_radio_force_sensor_analyze_individual_current_set_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox205">
+ <widget class="GtkHBox" id="hbox459">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_load">
+ <widget class="GtkImage"
id="image_force_sensor_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -21072,10 +21095,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label140">
+ <widget class="GtkLabel" id="label340">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Load
file</property>
+ <property name="label"
translatable="yes">Current set</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21087,35 +21110,41 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="x_options"/>
- <property name="y_options"/>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_force_sensor_ai_a">
+ <widget class="GtkRadioButton"
id="radio_force_sensor_analyze_individual_current_session">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_force_sensor_analyze_individual_current_set</property>
+ <signal name="toggled"
handler="on_radio_force_sensor_analyze_individual_current_session_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox460">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label360">
+ <widget class="GtkImage"
id="image_force_sensor_analyze_individual_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">A</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHScale"
id="hscale_force_sensor_ai_a">
- <property name="width_request">70</property>
+ <widget class="GtkLabel" id="label587">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">1 1 300 1 10
0</property>
- <property name="digits">0</property>
- <property name="draw_value">False</property>
- <signal name="value_changed"
handler="on_hscale_force_sensor_ai_a_value_changed" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21123,29 +21152,69 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox277">
+ <widget class="GtkLabel" id="label589">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="label"
translatable="yes">Individual</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="GtkHBox" id="hbox234">
+ <widget class="GtkFrame" id="frame29">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_first">
+ <widget class="GtkAlignment" id="alignment68">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">3</property>
+ <property name="bottom_padding">1</property>
+ <property name="left_padding">1</property>
+ <property name="right_padding">1</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_force_sensor_analyze_groupal_current_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_first_clicked" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_force_sensor_analyze_individual_current_set</property>
+ <signal name="toggled"
handler="on_radio_force_sensor_analyze_groupal_current_session_toggled" swapped="no"/>
<child>
- <widget class="GtkImage" id="image7">
+ <widget class="GtkHBox" id="hbox462">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-goto-first</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_groupal_current_session">
+ <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>
@@ -21154,17 +21223,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_pre_1s">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_1s_clicked" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_a_pre_1s">
+ <widget class="GtkLabel" id="label590">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </widget>
- </child>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21172,25 +21234,28 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_pre">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkLabel" id="label591">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
- <property name="icon-size">1</property>
+ <property name="label"
translatable="yes">Groupwise</property>
+ <property name="use_markup">True</property>
</widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -21201,42 +21266,37 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox235">
+ <widget class="GtkVBox" id="vbox246">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post">
+ <widget class="GtkButton"
id="button_force_sensor_analyze_options">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_options_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkHBox" id="hbox250">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_options">
+ <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="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post_1s">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_1s_clicked" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_a_post_1s">
+ <widget class="GtkLabel" id="label342">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </widget>
- </child>
+ <property name="label" translatable="yes">RFD
Model fitting options</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21244,27 +21304,81 @@ Concentric</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="pack_type">end</property>
+ <property name="position">1</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="GtkNotebook"
id="notebook_force_sensor_analyze_top">
+ <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="GtkVBox" id="vbox247">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkTable" id="table19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">16</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_last">
+ <widget class="GtkButton"
id="button_force_sensor_analyze_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_last_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_contacts_capture_load_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image8">
+ <widget class="GtkHBox" id="hbox205">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-goto-last</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_load">
+ <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">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label140">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Load
file</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21273,28 +21387,22 @@ Concentric</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_force_sensor_ai_b">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label361">
+ <widget class="GtkLabel" id="label360">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">B</property>
+ <property name="label">A</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -21303,14 +21411,14 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHScale"
id="hscale_force_sensor_ai_b">
+ <widget class="GtkHScale"
id="hscale_force_sensor_ai_a">
<property name="width_request">70</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">1 1 300 1 10
0</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
- <signal name="value_changed"
handler="on_hscale_force_sensor_ai_b_value_changed" swapped="no"/>
+ <signal name="value_changed"
handler="on_hscale_force_sensor_ai_a_value_changed" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -21319,22 +21427,22 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_buttons_scale_force_sensor_ai_b">
+ <widget class="GtkHBox" id="hbox277">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox270">
+ <widget class="GtkHBox" id="hbox234">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_first">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_first">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_first_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_first_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image9">
+ <widget class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-first</property>
@@ -21349,13 +21457,13 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_pre_1s">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_pre_1s">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_1s_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_1s_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_b_pre_1s">
+ <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_a_pre_1s">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
@@ -21368,13 +21476,13 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_pre">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_pre">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image4">
+ <widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
@@ -21383,8 +21491,8 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@@ -21396,17 +21504,17 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox286">
+ <widget class="GtkHBox" id="hbox235">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image5">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
@@ -21421,13 +21529,13 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post_1s">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post_1s">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_1s_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_1s_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_b_post_1s">
+ <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_a_post_1s">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
@@ -21440,13 +21548,13 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_last">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_last">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_last_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_last_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image10">
+ <widget class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-last</property>
@@ -21478,20 +21586,18 @@ Concentric</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_force_sensor_ai_ab">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_b">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label380">
+ <widget class="GtkLabel" id="label361">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">A+B</property>
+ <property name="label">B</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -21500,14 +21606,14 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHScale"
id="hscale_force_sensor_ai_ab">
+ <widget class="GtkHScale"
id="hscale_force_sensor_ai_b">
<property name="width_request">70</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">1 1 300 1 10
0</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
- <signal name="value_changed"
handler="on_hscale_force_sensor_ai_ab_value_changed" swapped="no"/>
+ <signal name="value_changed"
handler="on_hscale_force_sensor_ai_b_value_changed" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -21516,67 +21622,75 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox448">
+ <widget class="GtkHBox"
id="hbox_buttons_scale_force_sensor_ai_b">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkButton"
id="button_force_sensor_ai_zoom">
- <property name="label">Zoom [A-B]</property>
+ <widget class="GtkHBox" id="hbox270">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_first">
<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_ai_zoom_clicked" swapped="no"/>
- <accelerator key="z" signal="clicked"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_first_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-goto-first</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_ai_zoom_out">
- <property name="label">Zoom out</property>
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_pre_1s">
+ <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_ai_zoom_out_clicked" swapped="no"/>
- <accelerator key="z" signal="clicked"/>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_1s_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_b_pre_1s">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_pre">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon-size">1</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox182">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</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="sensitive">False</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">False</property>
@@ -21585,35 +21699,23 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">out</property>
- <child>
- <widget class="GtkAlignment" id="alignment64">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">1</property>
- <property name="bottom_padding">1</property>
- <property name="left_padding">1</property>
- <property name="right_padding">1</property>
- <child>
- <widget class="GtkHBox" id="hbox449">
+ <widget class="GtkHBox" id="hbox286">
<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_automatic_options">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label340">
+ <widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Model
fitting</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -21622,33 +21724,17 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_options">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post_1s">
<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_options_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox250">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_1s_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_options">
+ <widget class="GtkLabel"
id="label_hscale_force_sensor_ai_b_post_1s">
<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>
- <child>
- <widget class="GtkLabel" id="label342">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Options</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21656,51 +21742,18 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_analyze">
+ <widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_last">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_analyze_analyze_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox253">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_analyze">
- <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>
+ <signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_last_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label368">
+ <widget class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Analyze</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="stock">gtk-goto-last</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -21712,47 +21765,36 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox454">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_ab">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label185">
+ <widget class="GtkLabel" id="label380">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Export</property>
+ <property name="label">A+B</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -21761,29 +21803,33 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_force_sensor_export">
+ <widget class="GtkHScale"
id="hscale_force_sensor_ai_ab">
+ <property name="width_request">70</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="adjustment">1 1 300 1 10
0</property>
+ <property name="digits">0</property>
+ <property name="draw_value">False</property>
+ <signal name="value_changed"
handler="on_hscale_force_sensor_ai_ab_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox455">
+ <widget class="GtkHBox" id="hbox448">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkButton"
id="button_force_sensor_export_currentperson_in_session">
+ <widget class="GtkButton"
id="button_force_sensor_ai_zoom">
+ <property name="label">Zoom [A-B]</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_export_currentperson_in_session_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_export_currentperson_in_session">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
+ <signal name="clicked"
handler="on_button_force_sensor_ai_zoom_clicked" swapped="no"/>
+ <accelerator key="z" signal="clicked"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -21792,18 +21838,12 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_export_all_persons_in_session">
- <property name="visible">True</property>
+ <widget class="GtkButton"
id="button_force_sensor_ai_zoom_out">
+ <property name="label">Zoom out</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_export_all_persons_in_session_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_export_all_persons_in_session">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
+ <signal name="clicked"
handler="on_button_force_sensor_ai_zoom_out_clicked" swapped="no"/>
+ <accelerator key="z" signal="clicked"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -21812,69 +21852,89 @@ Concentric</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
- <child>
- <widget class="GtkLabel" id="label584">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">buttons</property>
</widget>
<packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox456">
+ <widget class="GtkHBox" id="hbox182">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkProgressBar"
id="progressbar_force_sensor_export">
- <property name="width_request">50</property>
+ <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">False</property>
+ <property name="sensitive">False</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">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_export_cancel">
+ <widget class="GtkHBox"
id="hbox_force_sensor_analyze_automatic_options">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_analyze_analyze">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_export_cancel_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_analyze_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_force_sensor_export_cancel">
+ <widget class="GtkHBox" id="hbox253">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label368">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">RFD
model Analyze</property>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label586">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">progressbar</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -21886,23 +21946,25 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook"
id="notebook_force_sensor_analyze">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_force_sensor_analyze">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
@@ -23767,6 +23829,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23914,41 +23982,163 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox283">
+ <widget class="GtkHBox" id="hbox283">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel"
id="label_force_sensor_ai_variability">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Variability</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_force_sensor_ai_variability_cvrmssd">
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">(cvRMSSD)</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</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>
+ <child>
+ <widget class="GtkVBox" id="vbox124">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_analyze_AB_save">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Export data from A to B</property>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_AB_save_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox131">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label366">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">AB</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_forcesensor_analyze_image_save7">
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_image_save_rfd_manual">
+ <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_manual_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox125">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_ai_variability">
+ <widget class="GtkImage"
id="image_forcesensor_analyze_save_rfd_manual">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Variability</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <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_ai_variability_cvrmssd">
+ <widget class="GtkImage"
id="image_forcesensor_analyze_image_save6">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">(cvRMSSD)</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -23959,53 +24149,88 @@ Concentric</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label301">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">manual</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="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label588">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">individual current
set</property>
+ </widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox124">
+ <widget class="GtkVBox" id="vbox249">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_AB_save">
+ <widget class="GtkHBox" id="hbox454">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_force_sensor_export">
+ <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="hbox455">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_export_current_session">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Export data from A to B</property>
- <signal name="clicked"
handler="on_button_force_sensor_analyze_AB_save_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_force_sensor_export_current_session_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox131">
+ <widget class="GtkHBox" id="hbox461">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label366">
+ <widget class="GtkLabel" id="label185">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">AB</property>
+ <property name="label">Export</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <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_save7">
+ <widget class="GtkImage"
id="image_force_sensor_analyze_table_save">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -24016,68 +24241,105 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_table_save_1">
+ <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">2</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
+ </widget>
+ </child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_image_save_rfd_manual">
+ <widget class="GtkLabel" id="label584">
<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_manual_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label">buttons</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkVBox" id="vbox125">
+ <widget class="GtkHBox" id="hbox456">
<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_manual">
+ <widget class="GtkProgressBar"
id="progressbar_force_sensor_export">
+ <property name="width_request">50</property>
<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="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_forcesensor_analyze_image_save6">
+ <widget class="GtkButton"
id="button_force_sensor_export_cancel">
+ <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_export_cancel_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_export_cancel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ </child>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label586">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">progressbar</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>
- <property name="pack_type">end</property>
- <property name="position">1</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>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -24086,10 +24348,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label301">
+ <widget class="GtkLabel" id="label592">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">manual</property>
+ <property name="label">individual/groupal
current session</property>
</widget>
<packing>
<property name="position">1</property>
@@ -24098,7 +24360,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment39">
+ <widget class="GtkAlignment"
id="alignment_force_sensor_rfd_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">10</property>
@@ -24155,7 +24417,6 @@ Concentric</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">radio_force_rfd_search_optimized_ab</property>
<signal name="toggled"
handler="on_radio_force_rfd_use_ab_range_toggled" swapped="no"/>
@@ -24184,7 +24445,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label201">
+ <widget class="GtkLabel" id="label315">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip"
translatable="yes">Length of analysis:</property>
@@ -24379,7 +24640,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label315">
+ <widget class="GtkLabel" id="label316">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">RFD</property>
@@ -24391,7 +24652,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label316">
+ <widget class="GtkLabel" id="label317">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">1</property>
@@ -24482,7 +24743,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label317">
+ <widget class="GtkLabel" id="label318">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -24539,7 +24800,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label318">
+ <widget class="GtkLabel" id="label319">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%
maximum force</property>
@@ -24629,7 +24890,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label319">
+ <widget class="GtkLabel" id="label320">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -24679,7 +24940,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label320">
+ <widget class="GtkLabel" id="label321">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">RFD</property>
@@ -24691,7 +24952,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label321">
+ <widget class="GtkLabel" id="label323">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">2</property>
@@ -24782,7 +25043,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label323">
+ <widget class="GtkLabel" id="label324">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -24839,7 +25100,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label324">
+ <widget class="GtkLabel" id="label325">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%
maximum force</property>
@@ -24929,7 +25190,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label325">
+ <widget class="GtkLabel" id="label326">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -24979,7 +25240,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label326">
+ <widget class="GtkLabel" id="label327">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">RFD</property>
@@ -24991,7 +25252,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label327">
+ <widget class="GtkLabel" id="label328">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">3</property>
@@ -25082,7 +25343,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label328">
+ <widget class="GtkLabel" id="label329">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -25139,7 +25400,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label329">
+ <widget class="GtkLabel" id="label330">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%
maximum force</property>
@@ -25229,7 +25490,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label330">
+ <widget class="GtkLabel" id="label331">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -25279,7 +25540,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label331">
+ <widget class="GtkLabel" id="label332">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">RFD</property>
@@ -25291,7 +25552,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label332">
+ <widget class="GtkLabel" id="label333">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">4</property>
@@ -25382,7 +25643,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label333">
+ <widget class="GtkLabel" id="label334">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -25439,7 +25700,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label334">
+ <widget class="GtkLabel" id="label335">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%
maximum force</property>
@@ -25529,7 +25790,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label335">
+ <widget class="GtkLabel" id="label336">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -25574,7 +25835,7 @@ Concentric</property>
<property name="draw_indicator">True</property>
<signal name="clicked"
handler="on_check_force_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label336">
+ <widget class="GtkLabel" id="label337">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Impulse</property>
@@ -25658,7 +25919,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label337">
+ <widget class="GtkLabel" id="label338">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">%
maximum force</property>
@@ -25748,7 +26009,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label338">
+ <widget class="GtkLabel" id="label341">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">ms</property>
@@ -25784,7 +26045,7 @@ Concentric</property>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">10</property>
+ <property name="top_padding">20</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox12">
<property name="visible">True</property>
@@ -25872,7 +26133,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label341">
+ <widget class="GtkLabel" id="label441">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Close</property>
@@ -25919,7 +26180,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label441">
+ <widget class="GtkLabel" id="label593">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Close
and analyze</property>
@@ -25952,10 +26213,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label253">
+ <widget class="GtkLabel" id="label201">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">automatic
options</property>
+ <property name="label">RFD options</property>
</widget>
<packing>
<property name="position">2</property>
@@ -28613,6 +28874,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>
@@ -28649,18 +28922,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>
@@ -36949,6 +37210,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 80efc705..a77ed57f 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -570,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;
- button_force_sensor_analyze_options.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;
if(force_capture_drawingarea != null && force_capture_pixmap != null)
@@ -1435,7 +1435,7 @@ LogB.Information(" fs C ");
force_capture_drawingarea.Sensitive = true;
button_force_sensor_image_save_signal.Sensitive = true;
notebook_force_sensor_analyze.Sensitive = true;
- button_force_sensor_analyze_options.Sensitive = true;
+ button_force_sensor_analyze_options_close_and_analyze.Sensitive =
true;
button_force_sensor_analyze_analyze.Sensitive = true;
if( configChronojump.Exhibition &&
@@ -1931,7 +1931,7 @@ LogB.Information(" fs R ");
button_contacts_exercise_close_and_recalculate.Sensitive = true;
force_capture_drawingarea.Sensitive = true;
notebook_force_sensor_analyze.Sensitive = true;
- button_force_sensor_analyze_options.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);
}
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index c81618ce..ef2de709 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -31,6 +31,17 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
//analyze tab
+ [Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_current_set;
+ [Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_current_session;
+ [Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_all_sessions;
+ [Widget] Gtk.RadioButton radio_force_sensor_analyze_groupal_current_session;
+
+ [Widget] Gtk.Image image_force_sensor_analyze_individual_current_set;
+ [Widget] Gtk.Image image_force_sensor_analyze_individual_current_session;
+ [Widget] Gtk.Image image_force_sensor_analyze_individual_all_sessions;
+ [Widget] Gtk.Image image_force_sensor_analyze_groupal_current_session;
+
+ [Widget] Gtk.Notebook notebook_force_sensor_analyze_top;
[Widget] Gtk.Button button_force_sensor_analyze_load;
[Widget] Gtk.Button button_force_sensor_analyze_analyze;
[Widget] Gtk.Label label_force_sensor_analyze;
@@ -54,9 +65,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_force_rfd_duration_percent;
//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;
[Widget] Gtk.Label label_hscale_force_sensor_ai_a_pre_1s;
[Widget] Gtk.Label label_hscale_force_sensor_ai_a_post_1s;
[Widget] Gtk.Label label_hscale_force_sensor_ai_b_pre_1s;
@@ -146,7 +159,8 @@ public partial class ChronoJumpWindow
private RepetitionMouseLimits fsAIRepetitionMouseLimits;
- private enum notebook_force_sensor_analyze_pages { AUTOMATIC, MANUAL, AUTOMATICOPTIONS }
+ private enum notebook_force_sensor_analyze_top_pages { CURRENTSET, CURRENTSESSION, AUTOMATICOPTIONS }
+ private enum notebook_force_sensor_analyze_pages { AUTOMATIC, MANUAL }
/*
* analyze options -------------------------->
*/
@@ -170,25 +184,30 @@ public partial class ChronoJumpWindow
hbox_top_person.Sensitive = s;
}
- private int notebook_force_sensor_analyze_LastPage;
+ private int notebook_force_sensor_analyze_top_LastPage;
private bool button_force_sensor_analyze_back_to_signal_LastSensitive;
private void on_button_force_sensor_analyze_options_clicked (object o, EventArgs args)
{
//store the notebook to return to same place
- notebook_force_sensor_analyze_LastPage = notebook_force_sensor_analyze.CurrentPage;
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.AUTOMATICOPTIONS);
+ notebook_force_sensor_analyze_top_LastPage = notebook_force_sensor_analyze_top.CurrentPage;
+ notebook_force_sensor_analyze_top.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_top_pages.AUTOMATICOPTIONS);
+
+ hbox_force_sensor_analyze_top_modes.Sensitive = false;
//do not allow to click Back while in options
button_force_sensor_analyze_back_to_signal_LastSensitive =
button_force_sensor_analyze_back_to_signal.Sensitive;
button_force_sensor_analyze_back_to_signal.Sensitive = false;
+ button_force_sensor_analyze_options_close_and_analyze.Visible =
radio_force_sensor_analyze_individual_current_set.Active;
+
forceSensorAnalyzeOptionsSensitivity(false);
}
private void on_button_force_sensor_analyze_options_close_clicked (object o, EventArgs args)
{
- //we can go to manual or to automatic
- notebook_force_sensor_analyze.CurrentPage = notebook_force_sensor_analyze_LastPage;
+ notebook_force_sensor_analyze_top.CurrentPage = notebook_force_sensor_analyze_top_LastPage;
+
+ hbox_force_sensor_analyze_top_modes.Sensitive = true;
button_force_sensor_analyze_back_to_signal.Sensitive =
button_force_sensor_analyze_back_to_signal_LastSensitive;
@@ -683,19 +702,35 @@ public partial class ChronoJumpWindow
bool force_sensor_ai_drawingareaShown = false;
- private void on_button_force_sensor_export_currentperson_in_session_clicked (object o, EventArgs args)
+ private void on_radio_force_sensor_analyze_individual_current_set_toggled (object o, EventArgs args)
{
- if(currentPerson == null || currentSession == null)
- return;
-
- button_force_sensor_export_session (currentPerson.UniqueID);
+ notebook_force_sensor_analyze_top.CurrentPage = 0;
+ }
+ private void on_radio_force_sensor_analyze_individual_current_session_toggled (object o, EventArgs
args)
+ {
+ notebook_force_sensor_analyze_top.CurrentPage = 1;
}
- private void on_button_force_sensor_export_all_persons_in_session_clicked (object o, EventArgs args)
+ private void on_radio_force_sensor_analyze_groupal_current_session_toggled (object o, EventArgs args)
+ {
+ notebook_force_sensor_analyze_top.CurrentPage = 1;
+ }
+
+ private void on_button_force_sensor_export_current_session_clicked (object o, EventArgs args)
{
if(currentSession == null)
return;
- button_force_sensor_export_session (-1);
+ if (radio_force_sensor_analyze_individual_current_session.Active)
+ {
+ if(currentPerson == null)
+ return;
+
+ button_force_sensor_export_session (currentPerson.UniqueID);
+ }
+ else if (radio_force_sensor_analyze_groupal_current_session.Active)
+ {
+ button_force_sensor_export_session (-1);
+ }
}
ForceSensorExport forceSensorExport;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 1c3cce6e..fab046a0 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -180,8 +180,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_laterality_both;
[Widget] Gtk.Image image_force_sensor_laterality_r;
[Widget] Gtk.Image image_force_sensor_laterality_l;
- [Widget] Gtk.Image image_force_sensor_export_currentperson_in_session;
- [Widget] Gtk.Image image_force_sensor_export_all_persons_in_session;
[Widget] Gtk.Image image_force_sensor_export_cancel;
//race encoder
@@ -220,6 +218,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_forcesensor_analyze_image_save5;
[Widget] Gtk.Image image_forcesensor_analyze_image_save6;
[Widget] Gtk.Image image_forcesensor_analyze_image_save7;
+ [Widget] Gtk.Image image_force_sensor_analyze_table_save;
+ [Widget] Gtk.Image image_force_sensor_analyze_table_save_1;
[Widget] Gtk.Image image_sprint_analyze_image_save;
[Widget] Gtk.Image image_raceAnalyzer_table_save_grid;
[Widget] Gtk.Image image_raceAnalyzer_table_save_disk;
@@ -718,6 +718,7 @@ public partial class ChronoJumpWindow
image_contacts_session_overview.Pixbuf = pixbuf;
image_encoder_session_overview.Pixbuf = pixbuf;
image_encoder_analyze_table_save.Pixbuf = pixbuf;
+ image_force_sensor_analyze_table_save.Pixbuf = pixbuf;
image_raceAnalyzer_table_save_grid.Pixbuf = pixbuf;
image_session_export_csv1.Pixbuf = pixbuf;
@@ -772,6 +773,7 @@ public partial class ChronoJumpWindow
image_forcesensor_analyze_image_save5.Pixbuf = pixbuf;
image_forcesensor_analyze_image_save6.Pixbuf = pixbuf;
image_forcesensor_analyze_image_save7.Pixbuf = pixbuf;
+ image_force_sensor_analyze_table_save_1.Pixbuf = pixbuf;
image_sprint_analyze_image_save.Pixbuf = pixbuf;
image_run_encoder_analyze_image_save_disk.Pixbuf = pixbuf;
image_raceAnalyzer_table_save_disk.Pixbuf = pixbuf;
@@ -805,10 +807,11 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualCurrentSetIcon);
image_encoder_analyze_individual_current_set.Pixbuf = pixbuf;
+ image_force_sensor_analyze_individual_current_set.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualCurrentSessionIcon);
image_encoder_analyze_individual_current_session.Pixbuf = pixbuf;
- image_force_sensor_export_currentperson_in_session.Pixbuf = pixbuf;
+ image_force_sensor_analyze_individual_current_session.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualAllSessionsIcon);
image_encoder_analyze_individual_all_sessions.Pixbuf = pixbuf;
@@ -816,7 +819,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeGroupalCurrentSessionIcon);
image_encoder_analyze_groupal_current_session.Pixbuf = pixbuf;
- image_force_sensor_export_all_persons_in_session.Pixbuf = pixbuf;
+ image_force_sensor_analyze_groupal_current_session.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzePowerbarsIcon);
image_encoder_analyze_powerbars.Pixbuf = pixbuf;