[chronojump] Fixed triggers on RaceAnalyzer analyze

[Xavier de Blas <xaviblas src gnome org>]

commit 20aaca7a87e643bf82217d69962058e9efccb80d
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Feb 16 15:45:10 2022 +0100

    Fixed triggers on RaceAnalyzer analyze

 r-scripts/sprintEncoder.R | 10 +++++-----
 src/gui/cairo/generic.cs  |  2 +-
 src/trigger.cs            |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/r-scripts/sprintEncoder.R b/r-scripts/sprintEncoder.R
index 774585ad7..3488c8463 100644
--- a/r-scripts/sprintEncoder.R
+++ b/r-scripts/sprintEncoder.R
@@ -16,7 +16,7 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # 
 #   Copyright (C) 2018-2020    Xavier Padullés <x padulles gmail com>
-#   Copyright (C) 2020-2021    Xavier de Blas <xaviblas gmail com>
+#   Copyright (C) 2020-2022    Xavier de Blas <xaviblas gmail com>
 
 
 #-------------- get params -------------
@@ -585,12 +585,12 @@ plotSprintFromEncoder <- function(sprintRawDynamics, sprintFittedDynamics,
         print("triggersOn on plot:")
         print(triggersOn)
         #TODO: Find why the T0 have to be added twice
-        triggersOn = triggersOn + 2*sprintFittedDynamics$T0
+       triggersOn = triggersOn + 2*sprintFittedDynamics$T0.fitted
         print(triggersOn)
        abline(v=triggersOn, col="green")
        print("triggersOff plot:")
        print(triggersOff)
-       triggersOff = triggersOff + 2*sprintFittedDynamics$T0
+       triggersOff = triggersOff + 2*sprintFittedDynamics$T0.fitted
        print(triggersOff)
        abline(v=triggersOff, col="red")
 
@@ -769,10 +769,10 @@ testEncoderCJ <- function(filename, filenameInstantaneous, testLength, splitLeng
                 print(paste("K =",sprintFittedDynamics$K.fitted, "Vmax =", sprintFittedDynamics$Vmax.fitted))
                 # print("triggersOn in testEncoderCJ:")
                 # print(triggersOn)
-                triggersOn = triggersOn/1E6 - sprintRawDynamics$startTime
+                triggersOn = triggersOn/1000 - sprintRawDynamics$startTime
                 # print("triggersOn in testEncoderCJ:")
                 # print(triggersOn)
-                triggersOff = triggersOff/1E6 - sprintRawDynamics$startTime
+                triggersOff = triggersOff/1000 - sprintRawDynamics$startTime
                 # print("triggersOff in testEncoderCJ:")
                 print(op$triggersOffList)
                 plotSprintFromEncoder(sprintRawDynamic = sprintRawDynamics, sprintFittedDynamics = 
sprintFittedDynamics,
diff --git a/src/gui/cairo/generic.cs b/src/gui/cairo/generic.cs
index b50280983..81138e8ed 100644
--- a/src/gui/cairo/generic.cs
+++ b/src/gui/cairo/generic.cs
@@ -189,7 +189,7 @@ public abstract class CairoGeneric
 
                double triggerInSeconds = UtilAll.DivideSafe(trigger.Us, 1000000);
                double xtemp = calculatePaintX(triggerInSeconds);
-               LogB.Information(string.Format("trigger.Us:{0}, xtemp:{1}", triggerInSeconds, xtemp));
+               //LogB.Information(string.Format("trigger.Us:{0}, xtemp:{1}", triggerInSeconds, xtemp));
                g.MoveTo(xtemp, topMargin);
                g.LineTo(xtemp, graphHeight - bottomMargin);
                g.Stroke ();
diff --git a/src/trigger.cs b/src/trigger.cs
index 3ab377e41..cf100c761 100644
--- a/src/trigger.cs
+++ b/src/trigger.cs
@@ -203,12 +203,12 @@ public class TriggerList
                {
                        if(trigger.InOut && type3 != Type3.OFF)
                        {
-                               s += sep + trigger.Ms.ToString();
+                               s += sep + Util.ConvertToPoint(trigger.Ms);
                                sep = sepChar.ToString();
                        }
                        if(! trigger.InOut && type3 != Type3.ON)
                        {
-                               s += sep + trigger.Ms.ToString();
+                               s += sep + Util.ConvertToPoint(trigger.Ms);
                                sep = sepChar.ToString();
                        }
                }