[chronojump] Fixed displacement on encoder rotary friction side

[Xavier de Blas <xaviblas src gnome org>]

commit 2753aaf39dc56f5f190035edd8ab268da8e1c9db
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Mar 31 19:39:17 2014 +0200

    Fixed displacement on encoder rotary friction side

 encoder/graph.R |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 7cb0fda..aa81125 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -1860,12 +1860,6 @@ getDynamicsNotInertial <- function(encoderConfigurationName, speed, accel, mass,
 
 getDynamicsInertial <- function(encoderConfigurationName, displacement, d, D, mass, inertiaMomentum, 
smoothing)
 {
-       #on friction side: know displacement of the "person"
-       if(encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIAL")
-       {
-               displacement = displacement * d / D #displacement of the axis
-       }
-
        speed = getSpeed(displacement, smoothing) #mm/ms == m/s 
 
        # accel will be:
@@ -2231,6 +2225,12 @@ doProcess <- function(options) {
                                #this is to make "inverted cumsum"
                                displacement = c(0,diff(position)) #this displacement is going to be used now
                        }
+       
+                       #on friction side: know displacement of the "person"
+                       if(EncoderConfigurationName == "ROTARYFRICTIONSIDEINERTIAL")
+                       {
+                               displacement = displacement * diameter / diameterExt #displacement of the axis
+                       }
                        
                        displacement = getDisplacementInertialBody(displacement, curvesPlot, Title)
                        curvesPlot = FALSE