[chronojump] Force sensor load set stiffness
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Force sensor load set stiffness
- Date: Thu, 24 Oct 2019 10:07:15 +0000 (UTC)
commit cc5af3299c3939c1430cfd1749e0a5d5e57355e8
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Oct 24 12:07:02 2019 +0200
Force sensor load set stiffness
src/gui/forceSensor.cs | 26 ++++++++++++++++++++------
src/gui/forceSensorElasticBands.cs | 8 ++++++--
2 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 5ff05176..3a9f76b7 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -1533,10 +1533,22 @@ LogB.Information(" fs R ");
combo_force_sensor_exercise.Active = UtilGtk.ComboMakeActive(combo_force_sensor_exercise,
Catalog.GetString(fs.ExerciseName));
setForceSensorCaptureOptions(fs.CaptureOption);
+
setLaterality(fs.Laterality);
textview_force_sensor_capture_comment.Buffer.Text = fs.Comments;
assignCurrentForceSensorExercise();
+
+ if(currentForceSensorExercise.ComputeAsElastic)
+ {
+ setStiffnessButtonLabel(fs.Stiffness);
+ button_force_sensor_stiffness.Visible = true;
+ } else
+ {
+ button_force_sensor_stiffness.Label = "0";
+ button_force_sensor_stiffness.Visible = false;
+ }
+
forceSensorCopyTempAndDoGraphs();
button_video_play_this_test.Sensitive = (fs.VideoURL != "");
@@ -2256,10 +2268,7 @@ LogB.Information(" fs R ");
List<ForceSensorElasticBand> list_fseb =
SqliteForceSensorElasticBand.SelectAll(false, true); //not opened, onlyActive
double stiffness = ForceSensorElasticBand.GetStiffnessOfActiveBands(list_fseb);
- if(stiffness == 0)
- button_force_sensor_stiffness.Label = Catalog.GetString("Configure fixation");
- else
- button_force_sensor_stiffness.Label = Catalog.GetString("Stiffness:") + " " +
stiffness.ToString() + " N/m";
+ setStiffnessButtonLabel(stiffness);
button_force_sensor_stiffness.Visible = true;
} else {
button_force_sensor_stiffness.Label = "0";
@@ -2413,11 +2422,16 @@ LogB.Information(" fs R ");
private void on_elastic_bands_win_stiffness_changed(object o, EventArgs args)
{
- if(forceSensorElasticBandsWin.TotalStiffness == "0")
+ setStiffnessButtonLabel (forceSensorElasticBandsWin.TotalStiffness);
+ }
+
+ private void setStiffnessButtonLabel (double stiffness)
+ {
+ if(stiffness <= 0)
button_force_sensor_stiffness.Label = Catalog.GetString("Configure fixation");
else
button_force_sensor_stiffness.Label = Catalog.GetString("Stiffness:") + " " +
- forceSensorElasticBandsWin.TotalStiffness + " N/m";
+ stiffness.ToString() + " N/m";
}
diff --git a/src/gui/forceSensorElasticBands.cs b/src/gui/forceSensorElasticBands.cs
index d18dc8a7..502df4c8 100644
--- a/src/gui/forceSensorElasticBands.cs
+++ b/src/gui/forceSensorElasticBands.cs
@@ -407,9 +407,13 @@ public class ForceSensorElasticBandsWindow
}
*/
- public string TotalStiffness
+ public double TotalStiffness
{
- get { return label_total_stiffness_value.Text; }
+ get {
+ if(label_total_stiffness_value.Text == "")
+ return 0;
+ return Convert.ToDouble(label_total_stiffness_value.Text);
+ }
}
public Button FakeButton_stiffness_changed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]