commit 2bcb57d3bbd31630a4016505acc54a42dc0aad2e
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Feb 11 18:40:02 2021 +0100
Force sensor analyze sliders gui changed, also moved load set button
glade/app1.glade | 183 ++++++++++++++++++++-----------------
src/gui/app1/forceSensorAnalyze.cs | 5 +
2 files changed, 103 insertions(+), 85 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index bf127718..bc68f34e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -21270,6 +21270,55 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox205">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <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_contacts_capture_load_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox463">
+ <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">
+ <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="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>
+ <property name="fill">True</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">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton"
id="button_force_sensor_analyze_options">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21296,7 +21345,7 @@ Concentric</property>
<widget class="GtkLabel" id="label342">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">RFD
Model fitting options</property>
+ <property name="label" translatable="yes">RFD
options</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21308,6 +21357,13 @@ Concentric</property>
</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">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
@@ -21349,36 +21405,30 @@ Concentric</property>
<property name="column_spacing">16</property>
<property name="row_spacing">2</property>
<child>
- <placeholder/>
- </child>
- <child>
- <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_contacts_capture_load_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox205">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_a">
<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="GtkLabel" id="label360">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="label">A</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="label140">
+ <widget class="GtkHScale"
id="hscale_force_sensor_ai_a">
+ <property name="width_request">70</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Load
file</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"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -21387,22 +21437,19 @@ Concentric</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
- <property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_force_sensor_ai_a">
+ <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="label360">
+ <widget class="GtkLabel" id="label361">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">A</property>
+ <property name="label">B</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -21411,14 +21458,14 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHScale"
id="hscale_force_sensor_ai_a">
+ <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_a_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>
@@ -21426,15 +21473,23 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox277">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkHBox" id="hbox234">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_first">
<property name="visible">True</property>
@@ -21507,6 +21562,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox235">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post">
<property name="visible">True</property>
@@ -21542,8 +21598,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">1</property>
</packing>
</child>
@@ -21570,66 +21626,28 @@ Concentric</property>
</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">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="y_options"/>
- </packing>
- </child>
- <child>
- <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="label361">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">B</property>
- </widget>
- <packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <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_b_value_changed" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
<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>
+ <property name="spacing">8</property>
<child>
<widget class="GtkHBox" id="hbox270">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_first">
<property name="visible">True</property>
@@ -21702,6 +21720,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox286">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post">
<property name="visible">True</property>
@@ -21737,8 +21756,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">1</property>
</packing>
</child>
@@ -21765,16 +21784,10 @@ Concentric</property>
</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">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -21783,7 +21796,6 @@ Concentric</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>
@@ -21842,6 +21854,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index eef3bc64..c1e7ffe9 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -706,10 +706,13 @@ 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;
}
private void on_radio_force_sensor_analyze_individual_current_session_toggled (object o, EventArgs
args)
{
+ button_force_sensor_analyze_load.Visible = false;
+
if(currentPerson != null)
label_force_sensor_export_data.Text = currentPerson.Name;
else
@@ -719,6 +722,8 @@ public partial class ChronoJumpWindow
}
private void on_radio_force_sensor_analyze_groupal_current_session_toggled (object o, EventArgs args)
{
+ button_force_sensor_analyze_load.Visible = false;
+
label_force_sensor_export_data.Text = currentSession.Name;
notebook_force_sensor_analyze_top.CurrentPage = 1;