[chronojump] RaceAnalyzer changed some vars to implement the variable dist vertical grid lines



commit 2706013d38ac47eaf70415b2df1f915baf59ca32
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Feb 4 16:55:39 2022 +0100

    RaceAnalyzer changed some vars to implement the variable dist vertical grid lines

 src/gui/app1/runEncoder.cs | 12 ++++++------
 src/runEncoder.cs          | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index f94aca41a..5034b874c 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -2229,8 +2229,8 @@ public partial class ChronoJumpWindow
 
                TwoListsOfInts verticalLinesUs_2l = new TwoListsOfInts("dist","time");
                if(currentRunEncoderExercise != null && currentRunEncoderExercise.SegmentMeters > 0 &&
-                               reCGSD.SegmentMetersTime_2l != null)
-                       verticalLinesUs_2l = reCGSD.SegmentMetersTime_2l;
+                               reCGSD.SegmentDistTime_2l != null)
+                       verticalLinesUs_2l = reCGSD.SegmentDistTime_2l;
 
 
                if(cairoGraphRaceAnalyzer_dt == null)
@@ -2245,8 +2245,8 @@ public partial class ChronoJumpWindow
        {
                TwoListsOfInts verticalLinesUs_2l = new TwoListsOfInts("dist","time");
                if(currentRunEncoderExercise != null && currentRunEncoderExercise.SegmentMeters > 0 &&
-                               reCGSD.SegmentMetersTime_2l != null)
-                       verticalLinesUs_2l = reCGSD.SegmentMetersTime_2l;
+                               reCGSD.SegmentDistTime_2l != null)
+                       verticalLinesUs_2l = reCGSD.SegmentDistTime_2l;
 
                if(cairoGraphRaceAnalyzer_st == null)
                        cairoGraphRaceAnalyzer_st = new CairoGraphRaceAnalyzer(
@@ -2263,8 +2263,8 @@ public partial class ChronoJumpWindow
 
                TwoListsOfInts verticalLinesUs_2l = new TwoListsOfInts("dist","time");
                if(currentRunEncoderExercise != null && currentRunEncoderExercise.SegmentMeters > 0 &&
-                               reCGSD.SegmentMetersTime_2l != null)
-                       verticalLinesUs_2l = reCGSD.SegmentMetersTime_2l;
+                               reCGSD.SegmentDistTime_2l != null)
+                       verticalLinesUs_2l = reCGSD.SegmentDistTime_2l;
 
                if(cairoGraphRaceAnalyzer_at == null)
                        cairoGraphRaceAnalyzer_at = new CairoGraphRaceAnalyzer(
diff --git a/src/runEncoder.cs b/src/runEncoder.cs
index 94c3dc624..14a7e13ae 100644
--- a/src/runEncoder.cs
+++ b/src/runEncoder.cs
@@ -272,7 +272,7 @@ public class RunEncoderCaptureGetSpeedAndDisplacement
        //to calcule the vertical lines on pos/time, speed/time, accel/time
        //it is calculated once and used on all
        private int segmentMeters;
-       private TwoListsOfInts segmentMetersTime_2l;
+       private TwoListsOfInts segmentDistTime_2l;
 
        private int encoderDisplacement;
        private int time;
@@ -289,7 +289,7 @@ public class RunEncoderCaptureGetSpeedAndDisplacement
        {
                this.segmentMeters = segmentMeters;
 
-               segmentMetersTime_2l = new TwoListsOfInts("dist","time");
+               segmentDistTime_2l = new TwoListsOfInts("dist","time");
                timePre = 0;
        }
 
@@ -330,7 +330,7 @@ public class RunEncoderCaptureGetSpeedAndDisplacement
                                runEncoderCaptureDistance += runEncoderCaptureDistanceAtThisSample;
 
                                if(segmentMeters > 0)
-                                       updateSegmentMetersTime ();
+                                       updateSegmentDistTime ();
 
                                hasCalculed = true;
                        }
@@ -338,10 +338,10 @@ public class RunEncoderCaptureGetSpeedAndDisplacement
                }
                return hasCalculed;
        }
-       private void updateSegmentMetersTime () //TODO: implement also for variable segmentMeters
+       private void updateSegmentDistTime () //TODO: implement also for variable segmentMeters
        {
-               if(runEncoderCaptureDistance >= segmentMeters * (segmentMetersTime_2l.Count() +1))
-                       segmentMetersTime_2l.Add(segmentMeters * (segmentMetersTime_2l.Count() +1), time);
+               if(runEncoderCaptureDistance >= segmentMeters * (segmentDistTime_2l.Count() +1))
+                       segmentDistTime_2l.Add(segmentMeters * (segmentDistTime_2l.Count() +1), time);
        }
 
        public int EncoderDisplacement {
@@ -367,8 +367,8 @@ public class RunEncoderCaptureGetSpeedAndDisplacement
        public double RunEncoderCaptureDistance {
                get { return runEncoderCaptureDistance; }
        }
-       public TwoListsOfInts SegmentMetersTime_2l {
-               get { return segmentMetersTime_2l; }
+       public TwoListsOfInts SegmentDistTime_2l {
+               get { return segmentDistTime_2l; }
        }
 }
 


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