[chronojump] More care on ForceSensor Elatic and ComputeAsElastic
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] More care on ForceSensor Elatic and ComputeAsElastic
- Date: Sat, 22 Feb 2020 17:30:25 +0000 (UTC)
commit 55307cdd220f6012f1cfcce6a7bd6fa862ab6e1e
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Feb 22 18:21:26 2020 +0100
More care on ForceSensor Elatic and ComputeAsElastic
src/forceSensor.cs | 12 ++++++------
src/gui/app1/encoder.cs | 2 +-
src/gui/app1/forceSensorAnalyze.cs | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index 07a91d35..b3ff84c3 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -495,10 +495,14 @@ public class ForceSensorExercise
{
get { return forceResultant; }
}
- public bool Elastic
+ public bool Elastic //TODO: take care because ComputeAsElastic is much better criteria
{
get { return elastic; }
}
+ public bool ComputeAsElastic //use this
+ {
+ get { return forceResultant && elastic; }
+ }
public bool EccReps
{
get { return eccReps; }
@@ -512,10 +516,6 @@ public class ForceSensorExercise
get { return conMin; }
}
- public bool ComputeAsElastic
- {
- get { return forceResultant && elastic; }
- }
}
public class ForceSensorElasticBand
@@ -1485,7 +1485,7 @@ public class ForceSensorAnalyzeInstant
}
ForceSensorDynamics forceSensorDynamics;
- if(fse.Elastic)
+ if(fse.ComputeAsElastic)
forceSensorDynamics = new ForceSensorDynamicsElastic(
times, forces, fsco, fse, personWeight, stiffness,
eccMinDisplacement, conMinDisplacement);
else
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 44c43873..11832a87 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -2083,7 +2083,7 @@ public partial class ChronoJumpWindow
checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_RFD_MANUAL ||
checkFileOp == Constants.CheckFileOp.FORCESENSOR_ANALYZE_SAVE_AB )
{
- if(currentForceSensorExercise.Elastic)
+ if(currentForceSensorExercise.ComputeAsElastic)
nameString += "_" + currentForceSensorExercise.Name + "_Stiffness" +
currentForceSensor.Stiffness.ToString();
else
nameString += "_" + currentForceSensorExercise.Name;
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 41cf5dc0..36991262 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -631,7 +631,7 @@ public partial class ChronoJumpWindow
//pass them as doubles
double eccMinDispl;
double conMinDispl;
- if(currentForceSensorExercise.Elastic)
+ if(currentForceSensorExercise.ComputeAsElastic)
{
eccMinDispl = preferences.forceSensorElasticEccMinDispl;
conMinDispl = preferences.forceSensorElasticConMinDispl;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]