[chronojump] Fixed displacement on ROTARYAXISINERTIAL

[Xavier de Blas <xaviblas src gnome org>]

commit c1ad1801e14ee7c9a017429a89cff0b98e624a8e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Mar 18 16:27:40 2014 +0100

    Fixed displacement on ROTARYAXISINERTIAL

 encoder/graph.R |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 57311a5..e5b0ea0 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2083,8 +2083,8 @@ getDynamicsInertial <- function(encoderConfigurationName, displacement, d, D, ma
         #print(c("g",g))
        #print(c("angleAccel",angleAccel))
        #print(c("angleSpeed",angleSpeed))
-       print(c("speed",speed))
-       print(c("accel",accel))
+       #print(c("speed",speed))
+       #print(c("accel",accel))
        #print(c("force",force))
        #print(c("power at inertial",power))
        #print(c("powerBody",powerBody[1000]))
@@ -2393,13 +2393,28 @@ doProcess <- function(options) {
                        quit()
                }
 
+               if(EncoderConfigurationName == "ROTARYAXISINERTIAL") {
+                       displacementMeters = displacement / 1000 #mm -> m
+                       diameterMeters = diameter / 100 #cm -> m
+
+                       ticksRotaryEncoder = 200 #our rotary axis encoder send 200 ticks by turn
+                       #angle in radians
+                       angle = abs(cumsum(displacementMeters * 1000)) * 2 * pi / ticksRotaryEncoder
+                       position = angle * diameterMeters / 2
+                       position = position * 1000      #m -> mm
+                       #this is to make "inverted cumsum"
+                       displacement = c(0,diff(position))
+               } else
+                       position=cumsum(displacement)
+
+               #print(c("position",position))
+               #print(c("displacement",displacement))
+               
                curves=findCurves(displacement, Eccon, MinHeight, curvesPlot, Title)
 
                if(Analysis == "curves")
                        curvesPlot = TRUE
 
-               position=cumsum(displacement)
-
                n=length(curves[,1])
                quitIfNoData(n, curves, OutputData1)