[chronojump] fixed sensitivity of forcesensor sliders on RFD analyze since last commits
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] fixed sensitivity of forcesensor sliders on RFD analyze since last commits
- Date: Fri, 20 Nov 2020 15:00:14 +0000 (UTC)
commit 35e248f7082376b51a7202fcf2ed18e1079cf3cc
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Nov 20 15:59:30 2020 +0100
fixed sensitivity of forcesensor sliders on RFD analyze since last commits
glade/app1.glade | 6 +++---
src/gui/app1/forceSensor.cs | 10 ++++++++++
src/gui/app1/forceSensorAnalyze.cs | 11 +++++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index cf6a0ee9..70e3e1c7 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -20780,7 +20780,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox339">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -20977,7 +20977,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox340">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_b">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -21176,7 +21176,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox342">
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_ab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 8a6ded5b..41836ec5 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -1349,6 +1349,11 @@ LogB.Information(" fs C ");
forceSensorZoomDefaultValues();
forceSensorDoGraphAI(false);
}
+
+ hbox_force_sensor_ai_a.Sensitive = true;
+ hbox_force_sensor_ai_b.Sensitive = true;
+ hbox_force_sensor_ai_ab.Sensitive = true;
+
button_contacts_exercise_close_and_recalculate.Sensitive = true;
button_delete_last_test.Sensitive = true;
force_capture_drawingarea.Sensitive = true;
@@ -1842,6 +1847,11 @@ LogB.Information(" fs R ");
forceSensorDoGraphAI(false);
}
//event_execute_label_message.Text = "Loaded: " +
Util.GetLastPartOfPath(filechooser.Filename);
+
+ hbox_force_sensor_ai_a.Sensitive = true;
+ hbox_force_sensor_ai_b.Sensitive = true;
+ hbox_force_sensor_ai_ab.Sensitive = true;
+
button_contacts_exercise_close_and_recalculate.Sensitive = true;
force_capture_drawingarea.Sensitive = true;
notebook_force_sensor_analyze.Sensitive = true;
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 07a5803e..ac056256 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -240,12 +240,20 @@ public partial class ChronoJumpWindow
return;
}
+ hbox_force_sensor_ai_a.Sensitive = false;
+ hbox_force_sensor_ai_b.Sensitive = false;
+ hbox_force_sensor_ai_ab.Sensitive = false;
+
if(lastForceSensorFullPath != null && lastForceSensorFullPath != "")
forceSensorCopyTempAndDoGraphs(forceSensorGraphsEnum.RFD);
}
private void on_button_force_sensor_analyze_back_to_signal_clicked (object o, EventArgs args)
{
+ hbox_force_sensor_ai_a.Sensitive = true;
+ hbox_force_sensor_ai_b.Sensitive = true;
+ hbox_force_sensor_ai_ab.Sensitive = true;
+
notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
button_force_sensor_analyze_back_to_signal.Sensitive = false;
}
@@ -568,6 +576,9 @@ public partial class ChronoJumpWindow
get { return impulse; }
}
+ [Widget] Gtk.HBox hbox_force_sensor_ai_a;
+ [Widget] Gtk.HBox hbox_force_sensor_ai_b;
+ [Widget] Gtk.HBox hbox_force_sensor_ai_ab;
[Widget] Gtk.DrawingArea force_sensor_ai_drawingarea;
[Widget] Gtk.HScale hscale_force_sensor_ai_a;
[Widget] Gtk.HScale hscale_force_sensor_ai_b;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]