[chronojump] Better encoder capture / analyze treeview

[Xavier de Blas <xaviblas src gnome org>]

commit 8ce4d79d3f74e89ca3f944b614176016cf7ad2c0
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed May 14 13:17:04 2014 +0200

    Better encoder capture / analyze treeview

 src/gui/encoder.cs          |    2 +-
 src/gui/encoderTreeviews.cs |   38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 62a5f43..fe7f7c1 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -3730,7 +3730,7 @@ Log.WriteLine(str);
        void plotCurvesGraphDoPlot(string mainVariable, double mainVariableHigher, double mainVariableLower, 
                        ArrayList data4Variables, bool capturing) 
        {
-               Log.WriteLine("at plotCurvesGraphDoPlot");
+               //Log.WriteLine("at plotCurvesGraphDoPlot");
                UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea, 
encoder_capture_curves_bars_pixmap);
 
                int graphWidth=encoder_capture_curves_bars_drawingarea.Allocation.Width;
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index cb708a7..6f2955a 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -39,17 +39,17 @@ public partial class ChronoJumpWindow
                bool showStartAndDuration = encoderCaptureOptionsWin.check_show_start_and_duration.Active;
 
                string [] columnsString = {
-                       Catalog.GetString("Curve") + "\n",
+                       Catalog.GetString("n") + "\n",
                        Catalog.GetString("Start") + "\n (s)",
                        Catalog.GetString("Duration") + "\n (s)",
-                       Catalog.GetString("Range") + "\n (cm)",
-                       Catalog.GetString("MeanSpeed") + "\n (m/s)",
-                       Catalog.GetString("MaxSpeed") + "\n (m/s)",
-                       Catalog.GetString("MaxSpeedTime") + "\n (s)",
-                       Catalog.GetString("MeanPower") + "\n (W)",
-                       Catalog.GetString("PeakPower") + "\n (W)",
-                       Catalog.GetString("PeakPowerTime") + "\n (s)",
-                       Catalog.GetString("PeakPower/PPT") + "\n (W/s)"
+                       Catalog.GetString("Distance") + "\n (cm)",
+                       "v" + "\n (m/s)",
+                       "vmax" + "\n (m/s)",
+                       "t->vmax" + "\n (s)",
+                       "p" + "\n (W)",
+                       "pmax" + "\n (W)",
+                       "t->pmax" + "\n (s)",
+                       "pmax/t->pmax" + "\n (W/s)"
                };
 
                encoderCaptureCurves = new ArrayList ();
@@ -260,14 +260,14 @@ public partial class ChronoJumpWindow
                Catalog.GetString("Displaced weight") + "\n (Kg)",
                Catalog.GetString("Start") + "\n (s)",
                Catalog.GetString("Duration") + "\n (s)",
-               Catalog.GetString("Range") + "\n (cm)",
-               Catalog.GetString("MeanSpeed") + "\n (m/s)",
-               Catalog.GetString("MaxSpeed") + "\n (m/s)",
-               Catalog.GetString("MaxSpeedTime") + "\n (s)",
-               Catalog.GetString("MeanPower") + "\n (W)",
-               Catalog.GetString("PeakPower") + "\n (W)",
-               Catalog.GetString("PeakPowerTime") + "\n (s)",
-               Catalog.GetString("PeakPower/PPT") + "\n (W/s)"
+               Catalog.GetString("Distance") + "\n (cm)",
+               "v" + "\n (m/s)",
+               "vmax" + "\n (m/s)",
+               "t->vmax" + "\n (s)",
+               "p" + "\n (W)",
+               "pmax" + "\n (W)",
+               "t->pmax" + "\n (s)",
+               "pmax/t->pmax" + "\n (W/s)"
        };
 
        bool lastTreeviewEncoderAnalyzeIsNeuromuscular = false;
@@ -762,7 +762,7 @@ public partial class ChronoJumpWindow
                        (cell as Gtk.CellRendererText).Foreground = null;       //will show default color
 
                (cell as Gtk.CellRendererText).Text = 
-                       
String.Format(UtilGtk.TVNumPrint(curve.MeanPower,9,3),Convert.ToDouble(curve.MeanPower));
+                       
String.Format(UtilGtk.TVNumPrint(curve.MeanPower,9,1),Convert.ToDouble(curve.MeanPower));
        }
 
        private void RenderPeakPower (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, 
Gtk.TreeIter iter)
@@ -780,7 +780,7 @@ public partial class ChronoJumpWindow
                        (cell as Gtk.CellRendererText).Foreground = null;       //will show default color
 
                (cell as Gtk.CellRendererText).Text = 
-                       
String.Format(UtilGtk.TVNumPrint(curve.PeakPower,9,3),Convert.ToDouble(curve.PeakPower));
+                       
String.Format(UtilGtk.TVNumPrint(curve.PeakPower,9,1),Convert.ToDouble(curve.PeakPower));
        }
 
        private void RenderPeakPowerT (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, 
Gtk.TreeIter iter)