[chronojump] showing force on encoder capture tab (33%)

[Xavier de Blas <xaviblas src gnome org>]

commit 9b4757e92f38189799bb441bb38d74c1286d130b
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Feb 16 12:44:21 2015 +0100

    showing force on encoder capture tab (33%)

 encoder/graph.R             |    8 ++++----
 encoder/util.R              |    3 ++-
 src/gui/encoderTreeviews.cs |    8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 13f7419..ff27e0f 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -1108,15 +1108,15 @@ findPosInPaf <- function(var, option) {
        else if(var == "Force")
                pos = 8
        else if(var == "Load") #MassDisplaced
-               pos = 10
-       else if(var == "MassBody")
                pos = 11
-       else if(var == "MassExtra")
+       else if(var == "MassBody")
                pos = 12
+       else if(var == "MassExtra")
+               pos = 13
        
        if( ( var == "Speed" || var == "Power" || var == "Force") & option == "max")
                pos=pos+1
-       if( ( var == "Speed" || var == "Power") & option == "time")
+       if( ( var == "Speed" || var == "Power" || var == "Force") & option == "time")
                pos=pos+2
 
        return(pos)
diff --git a/encoder/util.R b/encoder/util.R
index 40b492b..f67fe37 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -564,6 +564,7 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra) {
        pp_ppt <- peakPower / (peakPowerT/1000) # ms->s
        meanForce <- mean(kinematics$force)
        maxForce <- max(abs(kinematics$force))
+       maxForceT <- min(which(abs(kinematics$force) == maxForce))
 
        #here paf is generated
        #mass is not used by pafGenerate, but used by Kg/W (loadVSPower)
@@ -571,7 +572,7 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra) {
        return(data.frame(
                          meanSpeed, maxSpeed, maxSpeedT,
                          meanPower, peakPower, peakPowerT, pp_ppt,
-                         meanForce, maxForce,
+                         meanForce, maxForce, maxForceT,
                          kinematics$mass, massBody, massExtra)) #kinematics$mass is Load
 }
 
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index 749f47b..e5d12cd 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -77,10 +77,10 @@ public partial class ChronoJumpWindow
                                                        //cells[2],     //exerciseName
                                                        //cells[3],     //massBody
                                                        //cells[4],     //massExtra
-                                                       cells[5], cells[6], cells[7], 
-                                                       cells[8], cells[9], cells[10], 
-                                                       cells[11], cells[12], cells[13],
-                                                       cells[14]
+                                                       cells[5], cells[6], cells[7], //start, duration, 
height 
+                                                       cells[8], cells[9], cells[10], //meanSpeed, maxSpeed, 
maxSpeedT
+                                                       cells[11], cells[12], cells[13], //meanPower, 
peakPower, peakPowerT
+                                                       cells[14]                       //peakPower / 
peakPowerT
                                                        ));
 
                        } while(true);