[chronojump] On encoder capture, n and displacement is shown

[Xavier de Blas <xaviblas src gnome org>]

commit c90d67ed0e4b1892154489d0d857d65f4dfc92ce
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Mar 16 17:05:09 2015 +0100

    On encoder capture, n and displacement is shown

 encoder/capture.R  |   12 ++++++------
 howto_compile.txt  |    6 ++++++
 src/gui/encoder.cs |   10 ++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/encoder/capture.R b/encoder/capture.R
index f532303..f3a1eb6 100644
--- a/encoder/capture.R
+++ b/encoder/capture.R
@@ -26,7 +26,7 @@ filenameCompose <- function(curveNum)
                return(paste(filenameBegins, "-00", curveNum, sep=""))  #eg. "filename-003"
 }
 
-calcule <- function(displacement, start, end, op, curveNum) 
+calcule <- function(displacement, start, end, op, curveNum)
 {
        if(debug)
                write("At calcule", stderr())
@@ -79,7 +79,7 @@ calcule <- function(displacement, start, end, op, curveNum)
        filename <- filenameCompose(curveNum)
        con <- file(filename, "w")
        cat(paste(#start, #start is not used because we have no data of the initial zeros
-                 0, 0, 
+                 (curveNum +1), sum(displacement), #title, height
                  paf$meanSpeed, paf$maxSpeed, paf$maxSpeedT, 
                  paf$meanPower, paf$peakPower, paf$peakPowerT, paf$pp_ppt, 
                  paf$meanForce, paf$maxForce, paf$maxForceT,
@@ -209,20 +209,20 @@ doProcess <- function(options)
                        displacement2 = displacement[(positionTop+1):length(displacement)]
 
                        if(op$Eccon == "c") {
-                               calcule(displacement1, start, end, op, curveNum) #TODO: check this start, end
+                               calcule(displacement1, start, end, op, curveNum)
                                curveNum = curveNum +1
                        } else {
-                               calcule(displacement1, start, end, op, curveNum) #TODO: check this start, end
+                               calcule(displacement1, start, end, op, curveNum)
                                curveNum = curveNum +1
                                
-                               calcule(displacement2, start, end, op, curveNum) #TODO: check this start, end
+                               calcule(displacement2, start, end, op, curveNum)
                                curveNum = curveNum +1
                        }
 
                        #write(c("positionTop", positionTop), stderr())
                        #write(c("length(displacement)", length(displacement)), stderr())
                } else {
-                       calcule(displacement, start, end, op, curveNum) #TODO: check this start, end
+                       calcule(displacement, start, end, op, curveNum)
                        curveNum = curveNum +1
                }
                if(debug)
diff --git a/howto_compile.txt b/howto_compile.txt
index f28392a..1c1abc1 100644
--- a/howto_compile.txt
+++ b/howto_compile.txt
@@ -76,6 +76,12 @@ last line of the script can be changed to:
 ./mono --config $PREFIX/etc/mono/config $PREFIX/lib/chronojump/ChronoJump.exe > /Users/<dir of the 
user>/log.txt 2>&1
 and executed from commandline or directly (GUI) from the installed app on /Applications
 
+To install the dmg need to open it and move to Applications folder
+If it opens blank (no contents( do from the command line:
+hdiutil mount Chronojump-1.4.9-x86_64.dmg
+sudo cp -R "/Volumes/Chronojump/Chronojump.app" /Applications
+hdiutil unmount "/Volumes/Chronojump/"
+
 
 -------------------------------------------------------------------
 WINDOWS
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index aa27f61..2e0f5e9 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -5156,10 +5156,12 @@ LogB.Debug("D");
 
                        string [] strs = trimmed.Split(new char[] {','});
 
-                       
encoderCaptureStringR.Add(string.Format("\n{0},2,a,3,4,{1},{2},{3},{4},{5},{6},{7},{8},{9},{10},{11},{12},{13}",
-                                       0,
-                                       0, strs[0],                     //start, width
-                                       strs[1],                        //height
+                       encoderCaptureStringR.Add(string.Format("\n" + 
+                                               "{0},2,a,3,4," + //id, seriesName, exerciseName, massBody, 
massExtra
+                                               "{1},{2},{3}," + //start, width, height
+                                               "{4},{5},{6},{7},{8},{9},{10},{11},{12},{13}",
+                                       strs[0],
+                                       0, 0, strs[1],                  //start, width, height
                                        strs[2], strs[3], strs[4],      //speeds
                                        strs[5], strs[6], strs[7],      //powers
                                        strs[8],                        //pp/ppt