[chronojump] On analyze: extraWeight and displacedWeight.CSV ok

[Xavier de Blas <xaviblas src gnome org>]

commit e1563dd690d93e4484d929efdf32baaa00ada0e0
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Jun 17 19:34:44 2013 +0200

    On analyze: extraWeight and displacedWeight.CSV ok

 src/encoder.cs     |    8 ++++++--
 src/gui/encoder.cs |   42 +++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 17 deletions(-)
---
diff --git a/src/encoder.cs b/src/encoder.cs
index cab86c8..d9e87a0 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -197,7 +197,8 @@ public class EncoderCurve
        }
 
        //used on TreeView analyze
-       public EncoderCurve (string n, string series, string exercise, double extraWeight,
+       public EncoderCurve (string n, string series, string exercise, 
+                       double extraWeight, double displacedWeight,
                        string start, string duration, string height,
                        string meanSpeed, string maxSpeed, string maxSpeedT,
                        string meanPower, string peakPower, string peakPowerT, 
@@ -207,6 +208,7 @@ public class EncoderCurve
                this.Series = series;
                this.Exercise = exercise;
                this.ExtraWeight = extraWeight;
+               this.DisplacedWeight = displacedWeight;
                this.Start = start;
                this.Duration = duration;
                this.Height = height;
@@ -222,7 +224,8 @@ public class EncoderCurve
        public string ToCSV() {
                string sep = ";";
                return 
-                       N + sep + Series + sep + Exercise + sep + ExtraWeight + sep + 
+                       N + sep + Series + sep + Exercise + sep + 
+                       ExtraWeight + sep + DisplacedWeight + sep + 
                        Start + sep + Duration + sep + Height + sep + 
                        MeanSpeed + sep + MaxSpeed + sep + MaxSpeedT + sep + 
                        MeanPower + sep + PeakPower + sep + PeakPowerT + sep + 
@@ -233,6 +236,7 @@ public class EncoderCurve
        public string Series;
        public string Exercise;
        public double ExtraWeight;
+       public double DisplacedWeight;
        public string Start;
        public string Duration;
        public string Height;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 049fa05..c8f90ea 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2635,6 +2635,7 @@ Log.WriteLine(str);
                        Catalog.GetString("Series") + "\n",
                        Catalog.GetString("Exercise") + "\n",
                        Catalog.GetString("Extra weight") + "\n (Kg)",
+                       Catalog.GetString("Displaced weight") + "\n (Kg)",
                        Catalog.GetString("Start") + "\n (s)",
                        Catalog.GetString("Duration") + "\n (s)",
                        Catalog.GetString("Range") + "\n (cm)",
@@ -2655,13 +2656,13 @@ Log.WriteLine(str);
                //write exercise and extra weight data
                ArrayList curvesData = new ArrayList();
                string exerciseName = "";
-               double mass = 0; 
+               double displacedMass = 0; 
                if(radiobutton_encoder_analyze_data_user_curves.Active) {
                        curvesData = SqliteEncoder.Select(
                                        false, -1, currentPerson.UniqueID, currentSession.UniqueID, "curve", 
true);
                } else {        //current signal
                        exerciseName = UtilGtk.ComboGetActive(combo_encoder_exercise);
-                       mass = findMassFromCombo(false);
+                       displacedMass = findMassFromCombo(false);
                }
 
                string line;
@@ -2685,17 +2686,18 @@ Log.WriteLine(str);
                                        /*
                                        EncoderSQL eSQL = (EncoderSQL) curvesData[curvesCount];
                                        exerciseName = eSQL.exerciseName;
-                                       mass = eSQL.extraWeight;
+                                       displacedMass = eSQL.extraWeight;
                                        */
                                        exerciseName = cells[2];
-                                       mass = Convert.ToDouble(cells[3]);
+                                       displacedMass = Convert.ToDouble(cells[3]);
                                }
 
                                encoderAnalyzeCurves.Add (new EncoderCurve (
                                                        cells[0], 
                                                        cells[1],       //seriesName 
-                                                       exerciseName, 
-                                                       mass,
+                                                       exerciseName,
+                                                       massWithoutPerson(displacedMass, exerciseName),
+                                                       displacedMass,
                                                        cells[4], cells[5], cells[6], 
                                                        cells[7], cells[8], cells[9], 
                                                        cells[10], cells[11], cells[12],
@@ -2740,33 +2742,36 @@ Log.WriteLine(str);
                                        aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderExtraWeight));
                                        break;
                                case 4:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderStart));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderDisplacedWeight));
                                        break;
                                case 5:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderDuration));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderStart));
                                        break;
                                case 6:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderHeight));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderDuration));
                                        break;
                                case 7:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMeanSpeed));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderHeight));
                                        break;
                                case 8:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMaxSpeed));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMeanSpeed));
                                        break;
                                case 9:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMaxSpeedT));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMaxSpeed));
                                        break;
                                case 10:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMeanPower));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMaxSpeedT));
                                        break;
                                case 11:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderPeakPower));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderMeanPower));
                                        break;
                                case 12:
-                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderPeakPowerT));
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderPeakPower));
                                        break;
                                case 13:
+                                       aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderPeakPowerT));
+                                       break;
+                               case 14:
                                        aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc 
(RenderPP_PPT));
                                        break;
                        }
@@ -2854,6 +2859,13 @@ Log.WriteLine(str);
                        
String.Format(UtilGtk.TVNumPrint(curve.ExtraWeight.ToString(),3,0),Convert.ToInt32(curve.ExtraWeight));
        }
 
+       private void RenderDisplacedWeight (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel 
model, Gtk.TreeIter iter)
+       {
+               EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
+               (cell as Gtk.CellRendererText).Text = 
+                       
String.Format(UtilGtk.TVNumPrint(curve.DisplacedWeight.ToString(),3,0),Convert.ToInt32(curve.DisplacedWeight));
+       }
+
        private void RenderStart (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, 
Gtk.TreeIter iter)
        {
                EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);