[chronojump] Encoder: export shows time to max (speed and power)

[Xavier de Blas <xaviblas src gnome org>]

commit 6da1418ea65f0914bbeb7235a713916cd1f0e674
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 26 20:13:25 2013 +0100

    Encoder: export shows time to max (speed and power)

 encoder/graph.R    |   26 +++++++++++++++++---------
 src/gui/encoder.cs |   20 ++++++++++----------
 src/util.cs        |    3 ++-
 3 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 2296612..1adcb71 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -519,7 +519,7 @@ paint <- function(rawdata, eccon, xmin, xmax, yrange, knRanges, superpose, highl
        }
 
        #time to arrive to peak power
-       peakPowerT=which(power == max(power))
+       peakPowerT=min(which(power == max(power)))
        if(draw & !superpose) {
                abline(v=peakPowerT, col=cols[3])
                points(peakPowerT, max(power),col=cols[3])
@@ -1160,39 +1160,47 @@ doProcess <- function(options) {
                        col1 = rawdata[curves[i,1]:curves[i,2]]
                        col2 = rawdata.cumsum[curves[i,1]:curves[i,2]]
 
-                       #add mean and max
+                       #add mean, max, and time to max
                        col1=append(col1,
-                                   c(NA,NA,NA,namesNums[((i-1)*curveCols)+1]),
+                                   c(NA,NA,NA,NA,namesNums[((i-1)*curveCols)+1]),
                                    after=0)
                        col2=append(col2,
-                                   c(NA,"mean (ABS):","max:",namesNums[((i-1)*curveCols)+2]),
+                                   c(NA,"mean (ABS):","max:","time to max:",namesNums[((i-1)*curveCols)+2]),
                                    after=0)
                        kn$speedy=append(kn$speedy,
                                         c(
                                           namesNums[((i-1)*curveCols)+3],
-                                          mean(abs(kn$speedy)),max(kn$speedy),
+                                          mean(abs(kn$speedy)),
+                                          max(kn$speedy),
+                                          (min(which(kn$speedy == max(kn$speedy)))/1000),
                                           namesNums[((i-1)*curveCols)+3]),
                                         after=0)
                        kn$accely=append(kn$accely,
                                         c(
                                           namesNums[((i-1)*curveCols)+4],
-                                          mean(abs(kn$accely)),max(kn$accely),
+                                          mean(abs(kn$accely)),
+                                          max(kn$accely),
+                                          NA,
                                           namesNums[((i-1)*curveCols)+4]),
                                         after=0)
                        kn$force=append(kn$force,
                                        c(
                                          namesNums[((i-1)*curveCols)+5],
-                                         mean(abs(kn$force)),max(kn$force),
+                                         mean(abs(kn$force)),
+                                         max(kn$force),
+                                         NA,
                                          namesNums[((i-1)*curveCols)+5]),
                                        after=0)
                        kn$power=append(kn$power,
                                        c(
                                          namesNums[((i-1)*curveCols)+6],
-                                         mean(abs(kn$power)),max(kn$power),
+                                         mean(abs(kn$power)),
+                                         max(kn$power),
+                                         (min(which(kn$power == max(kn$power)))/1000),
                                          namesNums[((i-1)*curveCols)+6]),
                                        after=0)
 
-                       extraRows=4
+                       extraRows=5
                        length(col1)=maxLength+extraRows
                        length(col2)=maxLength+extraRows
                        length(kn$speedy)=maxLength+extraRows
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 84efa78..a420542 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -230,8 +230,8 @@ public partial class ChronoJumpWindow
                if (o == (object) button_encoder_capture) {
                        //title to sen to python software has to be without spaces
                        Util.RunEncoderCapturePython( 
-                                       Util.ChangeSpaceForUnderscore(currentPerson.Name) + "----" + 
-                                       Util.ChangeSpaceForUnderscore(exerciseNameShown) + "----(" + 
findMass(true) + "Kg)",
+                                       Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "----" + 
+                                       Util.ChangeSpaceAndMinusForUnderscore(exerciseNameShown) + "----(" + 
findMass(true) + "Kg)",
                                        es, chronopicWin.GetEncoderPort());
 
                        calculeCurves();
@@ -366,8 +366,8 @@ public partial class ChronoJumpWindow
                                ep);
                
                Util.RunEncoderGraph(
-                               Util.ChangeSpaceForUnderscore(currentPerson.Name) + "-" + 
-                               Util.ChangeSpaceForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)) 
+ 
+                               Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" + 
+                               
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)) + 
                                "-(" + findMass(true) + "Kg)",
                                es);
 
@@ -563,8 +563,8 @@ public partial class ChronoJumpWindow
                                ep);
 
                Util.RunEncoderGraph(
-                               Util.ChangeSpaceForUnderscore(currentPerson.Name) + "-" + 
-                               Util.ChangeSpaceForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)) 
+ 
+                               Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" + 
+                               
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)) + 
                                        "-(" + findMass(true) + "Kg)",
                                encoderStruct);
 
@@ -877,8 +877,8 @@ public partial class ChronoJumpWindow
                Log.WriteLine("EEEEEEEEEEEEEEE");
                string exerciseNameShown = UtilGtk.ComboGetActive(combo_encoder_exercise);
                bool capturedOk = runEncoderCaptureCsharp( 
-                               Util.ChangeSpaceForUnderscore(currentPerson.Name) + "----" + 
-                               Util.ChangeSpaceForUnderscore(exerciseNameShown) + "----(" + findMass(true) + 
"Kg)",
+                               Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "----" + 
+                               Util.ChangeSpaceAndMinusForUnderscore(exerciseNameShown) + "----(" + 
findMass(true) + "Kg)",
                                //es, 
                                (int) spin_encoder_capture_time.Value, 
                                Util.GetEncoderDataTempFileName(),
@@ -1118,8 +1118,8 @@ public partial class ChronoJumpWindow
                //      massString = "";
 
                Util.RunEncoderGraph(
-                               Util.ChangeSpaceForUnderscore(currentPerson.Name) + "-" + 
-                               
Util.ChangeSpaceForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)), encoderStruct);
+                               Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" + 
+                               
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)), encoderStruct);
        }
        
        private void on_radiobutton_encoder_analyze_data_current_signal_toggled (object obj, EventArgs args) {
diff --git a/src/util.cs b/src/util.cs
index fa6ade0..28642b9 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -327,10 +327,11 @@ public class Util
                return myStringBuilder.ToString();
        }
 
-       public static string ChangeSpaceForUnderscore(string myString) 
+       public static string ChangeSpaceAndMinusForUnderscore(string myString) 
        {
                StringBuilder myStringBuilder = new StringBuilder(myString);
                myStringBuilder.Replace(" ", "_");
+               myStringBuilder.Replace("-", "_");
                return myStringBuilder.ToString();
        }