[chronojump] Fixed getDisplacement with gearedDown

[Xavier de Blas <xaviblas src gnome org>]

commit 1f9e38435d681cf3ce67eb8223ecf454000ec2f7
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sun Mar 5 21:51:42 2017 +0100

    Fixed getDisplacement with gearedDown

 encoder/capture.R |    2 +-
 encoder/graph.R   |    5 +++--
 encoder/util.R    |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/encoder/capture.R b/encoder/capture.R
index 136eed0..3dd4a70 100644
--- a/encoder/capture.R
+++ b/encoder/capture.R
@@ -209,7 +209,7 @@ doProcess <- function(options)
                        displacement = getDisplacementInertial(displacement, op$EncoderConfigurationName, 
                                                               diametersPerTick, op$diameterExt, 
op$gearedDown)
                } else {
-                       displacement = getDisplacement(op$EncoderConfigurationName, displacement, 
op$diameter, op$diameterExt)
+                       displacement = getDisplacement(op$EncoderConfigurationName, displacement, 
op$diameter, op$diameterExt, op$gearedDown)
                }
 
                
diff --git a/encoder/graph.R b/encoder/graph.R
index ce8d8d5..4c1745b 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2387,7 +2387,8 @@ doProcess <- function(options)
                                                                       inputMultiData$econfGearedDown[i] )
                                #getDisplacementInertialBody is not needed because it's done on curve save
                        } else {
-                               dataTempFile = getDisplacement(inputMultiData$econfName[i], dataTempFile, 
op$diameter, op$diameterExt)
+                               dataTempFile = getDisplacement(inputMultiData$econfName[i], dataTempFile, 
op$diameter, op$diameterExt,
+                                                              inputMultiData$econfGearedDown[i])
                        }
 
 
@@ -2541,7 +2542,7 @@ doProcess <- function(options)
 
                        curvesPlot <- FALSE
                } else {
-                       displacement <- getDisplacement(op$EncoderConfigurationName, displacement, 
op$diameter, op$diameterExt)
+                       displacement <- getDisplacement(op$EncoderConfigurationName, displacement, 
op$diameter, op$diameterExt, op$gearedDown)
                }
 
                #TODO: is this needed at all?
diff --git a/encoder/util.R b/encoder/util.R
index 9c1b7b9..c4cee51 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -942,7 +942,7 @@ getDynamicsInertial <- function(encoderConfigurationName, displacement, diameter
 
 
 #in signals and curves, need to do conversions (invert, diameter)
-getDisplacement <- function(encoderConfigurationName, displacement, diameter, diameterExt) {
+getDisplacement <- function(encoderConfigurationName, displacement, diameter, diameterExt, gearedDown) {
        #no change
        #WEIGHTEDMOVPULLEYLINEARONPERSON1, WEIGHTEDMOVPULLEYLINEARONPERSON1INV,
        #WEIGHTEDMOVPULLEYLINEARONPERSON2, WEIGHTEDMOVPULLEYLINEARONPERSON2INV,