[chronojump] Fixed smoothing on export (incorrectly was detecting propulsive phase)



commit d9f9425bd0cfa0038e7d147e8384c77ac911e03f
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Feb 13 19:54:28 2017 +0100

    Fixed smoothing on export (incorrectly was detecting propulsive phase)

 encoder/graph.R |    2 +-
 encoder/util.R  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 31d24c1..4144866 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -3384,7 +3384,7 @@ doProcess <- function(options)
                                                  "") #laterality 
 
                        kn <- kinematicsF(displacement[curves[i,1]:curves[i,2]],
-                                         repOp, SmoothingsEC[i], op$smoothingOneC, g, isPropulsive, 
+                                         repOp, SmoothingsEC[i], op$SmoothingOneC, g, isPropulsive,
                                          TRUE #TODO: think if it's more appropiate to be FALSE in order to 
export full ecc phase
                                          )
 
diff --git a/encoder/util.R b/encoder/util.R
index 028c83f..0b44f74 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -725,8 +725,8 @@ findPropulsiveEnd <- function(accel, concentric, maxSpeedTInConcentric,
        }
        else
                propulsiveEnd = length(concentric)
-       
-return (propulsiveEnd)
+
+       return (propulsiveEnd)
 }
 
 pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality, inertiaMomentum) 


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