[chronojump] Curves graph shows Kg or IM



commit 3c94d9959acf69acbd5a789cc975e28a9df63fb1
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue May 26 20:17:39 2015 +0200

    Curves graph shows Kg or IM

 src/gui/encoder.cs |   14 ++++++++++----
 src/utilEncoder.cs |    1 +
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index a0d950f..fbdd7af 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -800,11 +800,17 @@ public partial class ChronoJumpWindow
                                UtilEncoder.GetEncoderStatusTempBaseFileName(),
                                UtilEncoder.GetEncoderSpecialDataTempFileName(),
                                ep);
-       
+
+
+               string title = Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" +
+                       Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise));
+               if(encoderConfigurationCurrent.has_inertia)
+                       title += "-(" + encoderConfigurationCurrent.inertiaTotal.ToString() + " " + 
Catalog.GetString("Inertia M.") + ")";
+               else
+                       title += "-(" + Util.ConvertToPoint(findMass(Constants.MassType.DISPLACED)) + "Kg)";
+
                encoderRProcAnalyze.SendData(
-                               Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" + 
-                               
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_encoder_exercise)) + 
-                               "-(" + Util.ConvertToPoint(findMass(Constants.MassType.DISPLACED)) + "Kg)",
+                               title,
                                false,  //do not use neuromuscularProfile script
                                preferences.RGraphsTranslate
                                ); 
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index 35d67b3..811e10c 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -285,6 +285,7 @@ public class UtilEncoder
                string operatingSystem = "Linux";
                        
                title = Util.RemoveBackSlash(title);
+               title = Util.RemoveChar(title, '\''); 
                
                if (UtilAll.IsWindows()) {
                        //convert accents to Unicode in order to be plotted correctly on R windows


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]