[chronojump] on ecc-con, first repetition is not captured if it's con



commit 404d7b63dcb7a7f079bc30c15423747ac2879091
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jan 22 00:14:04 2015 +0100

    on ecc-con, first repetition is not captured if it's con

 src/gui/encoder.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 71985eb..53db3d3 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2178,14 +2178,18 @@ public partial class ChronoJumpWindow
                                                                        
                                                                previousEnd = ecc.endFrame;
                                                                
-                                                               //check heightCurve in a fast way first to 
discard curves soon
-                                                               //only process curves with height >= 
min_height
                                                                heightCurve = Math.Abs(heightCurve / 10); 
//mm -> cm
                                                                LogB.Information(" height: " + 
heightCurve.ToString());
                                                                
+                                                               //1) check heightCurve in a fast way first to 
discard curves soon
+                                                               //   only process curves with height >= 
min_height
+                                                               //2) if it's concentric, only take the 
concentric curves
+                                                               //3) if it's ecc-con, don't record first 
curve if first curve is concentric
+                                                               
                                                                if(
-                                                                               heightCurve >= 
encoderSelectedMinimumHeight &&
-                                                                               ( ( eccon == "c" && 
previousWasUp ) || eccon != "c" ) 
+                                                                               heightCurve >= 
encoderSelectedMinimumHeight &&                  //1
+                                                                               ( ( eccon == "c" && 
previousWasUp ) || eccon != "c" ) &&        //2
+                                                                               ! ( (eccon == "ec" || eccon 
== "ecS") && ecc.up && ecca.curvesAccepted == 0 )  //3
                                                                  ) {
                                                                        
UtilEncoder.RunEncoderCaptureNoRDotNetSendCurve(pCaptureNoRDotNet, curve);
                                                                        ecca.curvesDone ++;


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