[chronojump] ForceSensor load set shows maxForce (raw), maxAVGForce1s



commit f65f39785169bf9674b18524540cf473c45fb66d
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Jan 4 13:23:23 2022 +0100

    ForceSensor load set shows maxForce (raw), maxAVGForce1s

 src/forceSensor.cs          | 10 +++++++++-
 src/gui/app1/forceSensor.cs |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index 4475c5050..b3885dc1e 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -157,7 +157,7 @@ public class ForceSensor
        //for load window
        public string [] ToStringArray (int count)
        {
-               int all = 9;
+               int all = 11;
                string [] str = new String [all];
                int i=0;
                str[i++] = uniqueID.ToString();
@@ -166,6 +166,14 @@ public class ForceSensor
                str[i++] = exerciseElasticStiffnessString();
                str[i++] = Catalog.GetString(GetCaptureOptionsString(captureOption));
                str[i++] = Catalog.GetString(laterality);
+               if(maxForceRaw == -1)
+                       str[i++] = "----";
+               else
+                       str[i++] = Util.TrimDecimals(maxForceRaw, 2);
+               if(maxAvgForce1s == -1)
+                       str[i++] = "----";
+               else
+                       str[i++] = Util.TrimDecimals(maxAvgForce1s, 2);
                str[i++] = dateTime;
 
                //str[i++] = videoURL;
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index ed97db71c..fa704623e 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -2170,6 +2170,8 @@ LogB.Information(" fs R ");
                        Catalog.GetString("Elastic") + " (N/m)",
                        Catalog.GetString("Capture option"),
                        Catalog.GetString("Laterality"),
+                       "Max force" + " (" + Catalog.GetString("Raw Data") + ")", //TODO: translate
+                       string.Format("Max AVG Force in {0} s", 1), //TODO: translate
                        Catalog.GetString("Date"),
                        Catalog.GetString("Video"),
                        Catalog.GetString("Comment")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]