[chronojump] Inertia graphs - initial code

[Xavier de Blas <xaviblas src gnome org>]

commit 7b9b3d3942f2c905eb2b900f0ead10bdf4e2afba
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue May 12 19:18:53 2015 +0200

    Inertia graphs - initial code

 encoder/capture.R |    2 +-
 encoder/graph.R   |    4 +++-
 encoder/util.R    |    5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/encoder/capture.R b/encoder/capture.R
index 4b6ec89..4a39406 100644
--- a/encoder/capture.R
+++ b/encoder/capture.R
@@ -72,7 +72,7 @@ calcule <- function(displacement, op, curveNum)
 
        paf = data.frame()
        myLaterality = "" #TODO
-       paf = pafGenerate(op$Eccon, kinematicsResult, op$MassBody, op$MassExtra, myLaterality)
+       paf = pafGenerate(op$Eccon, kinematicsResult, op$MassBody, op$MassExtra, myLaterality, 
op$inertiaMomentum)
                
        position = cumsum(displacement)
 
diff --git a/encoder/graph.R b/encoder/graph.R
index 894b1a8..911a728 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -1344,6 +1344,8 @@ findPosInPaf <- function(var, option) {
                pos = 13
        else if(var == "Laterality")
                pos = 14
+       else if(var == "Inertia")
+               pos = 15
        
        if( ( var == "Speed" || var == "Power" || var == "Force") & option == "max")
                pos=pos+1
@@ -2549,7 +2551,7 @@ doProcess <- function(options)
                                                                 myInertiaMomentum,myGearedDown,
                                                                 SmoothingsEC[i],op$SmoothingOneC, 
                                                                 g, myEcconKn, isPropulsive),
-                                                    myMassBody, myMassExtra, myLaterality
+                                                    myMassBody, myMassExtra, myLaterality, myInertiaMomentum
                                                     )))
                }
 
diff --git a/encoder/util.R b/encoder/util.R
index f8e4310..f89a595 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -530,7 +530,7 @@ findPropulsiveEnd <- function(accel, concentric, maxSpeedTInConcentric,
 return (propulsiveEnd)
 }
 
-pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality) {
+pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality, inertiaMomentum) {
        #print("speed$y")
        #print(kinematics$speedy)
 
@@ -565,7 +565,8 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality) {
                          meanSpeed, maxSpeed, maxSpeedT,
                          meanPower, peakPower, peakPowerT, pp_ppt,
                          meanForce, maxForce, maxForceT,
-                         kinematics$mass, massBody, massExtra, laterality)) #kinematics$mass is Load
+                         kinematics$mass, massBody, massExtra,         #kinematics$mass is Load
+                         laterality, inertiaMomentum)) 
 }
 
 isInertial <- function(encoderConfigurationName) {