[chronojump] Improved encoder treeview

[Xavier de Blas <xaviblas src gnome org>]

commit d644d6a2becea8f194cb43ae3d0776a98732f6a4
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed May 23 12:07:17 2012 +0200

    Improved encoder treeview

 encoder/pyserial_pyper.py |    4 +-
 glade/chronojump.glade    |    4 +-
 src/gui/encoder.cs        |   46 ++++++++++++++++++++++++++++++++++++--------
 3 files changed, 41 insertions(+), 13 deletions(-)
---
diff --git a/encoder/pyserial_pyper.py b/encoder/pyserial_pyper.py
index 8f64b48..4cf21b3 100644
--- a/encoder/pyserial_pyper.py
+++ b/encoder/pyserial_pyper.py
@@ -198,7 +198,7 @@ def calculate_all_in_r(temp, top_values, bottom_values, direction_now, smoothing
 		height = myR.get('range')
 		meanPower = myR.get('meanPower')
 		peakPower = myR.get('peakPower')
-		peakPowerT = myR.get('peakPowerT')
+		peakPowerT = myR.get('peakPowerT/1000') #ms -> s
 
 		meanSpeedCol = "%10.2f," % meanSpeed
 
@@ -234,7 +234,7 @@ def calculate_all_in_r(temp, top_values, bottom_values, direction_now, smoothing
 
 		if eccon == "ec" or direction_now == -1:
 			if height >= minHeight:
-				print phaseCol + colorize(heightF,colorHeight,colorHeight!=BLACK) + colorize(meanSpeedF,colorMeanSpeed,colorMeanSpeed!=BLACK) + colorize(maxSpeedF,colorMaxSpeed,colorMaxSpeed!=BLACK) + colorize(meanPowerF,colorMeanPower,colorMeanPower!=BLACK) + colorize(peakPowerF,colorPeakPower,colorPeakPower!=BLACK) + "%11i" % peakPowerT
+				print phaseCol + colorize(heightF,colorHeight,colorHeight!=BLACK) + colorize(meanSpeedF,colorMeanSpeed,colorMeanSpeed!=BLACK) + colorize(maxSpeedF,colorMaxSpeed,colorMaxSpeed!=BLACK) + colorize(meanPowerF,colorMeanPower,colorMeanPower!=BLACK) + colorize(peakPowerF,colorPeakPower,colorPeakPower!=BLACK) + "%10.2f" % peakPowerT
 				if play:
 					playsound(soundFile)
 			else:
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 6fd05aa..5197307 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7666,7 +7666,7 @@ suitable for agility tests)</property>
                               <widget class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Power&lt;/b&gt; (W)</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Mean power&lt;/b&gt; (W)</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -8116,7 +8116,7 @@ suitable for agility tests)</property>
                               <widget class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Power&lt;/b&gt; (W)</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Mean power&lt;/b&gt; (W)</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c0070f7..3ce36f7 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -418,7 +418,9 @@ public partial class ChronoJumpWindow
 		//more at System.Drawing.Color (Monodoc)
 		string colorGood= "ForestGreen"; 
 		string colorBad= "red";
-		string colorNothing= "black";
+		string colorNothing= "";	
+		//colorNothing will use default color on system, previous I used black,
+		//but if the color of the users theme is not 000000, then it looked too different
 
 		if(higherActive && found >= higherValue)
 			return colorGood;
@@ -443,19 +445,25 @@ public partial class ChronoJumpWindow
 	private void RenderWidth (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
+		double myWidth = Convert.ToDouble(curve.Width)/1000; //ms->s
 		(cell as Gtk.CellRendererText).Text = 
-			String.Format(UtilGtk.TVNumPrint(curve.Width,8,3),Convert.ToDouble(curve.Width)/1000); //ms->s
+			String.Format(UtilGtk.TVNumPrint(myWidth.ToString(),8,3),myWidth); 
 	}
 	private void RenderHeight (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
 		string heightToCm = (Convert.ToDouble(curve.Height)/10).ToString();
-		(cell as Gtk.CellRendererText).Foreground = assignColor(
+		string myColor = assignColor(
 				Convert.ToDouble(heightToCm),
 				repetitiveConditionsWin.EncoderHeightHigher, 
 				repetitiveConditionsWin.EncoderHeightLower, 
 				repetitiveConditionsWin.EncoderHeightHigherValue,
 				repetitiveConditionsWin.EncoderHeightLowerValue);
+		if(myColor != "")
+			(cell as Gtk.CellRendererText).Foreground = myColor;
+		else
+			(cell as Gtk.CellRendererText).Foreground = null;	//will show default color
+
 		(cell as Gtk.CellRendererText).Text = 
 			String.Format(UtilGtk.TVNumPrint(heightToCm,8,1),Convert.ToDouble(heightToCm));
 	}
@@ -463,12 +471,17 @@ public partial class ChronoJumpWindow
 	private void RenderMeanSpeed (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
-		(cell as Gtk.CellRendererText).Foreground = assignColor(
+		string myColor = assignColor(
 				Convert.ToDouble(curve.MeanSpeed),
 				repetitiveConditionsWin.EncoderMeanSpeedHigher, 
 				repetitiveConditionsWin.EncoderMeanSpeedLower, 
 				repetitiveConditionsWin.EncoderMeanSpeedHigherValue,
 				repetitiveConditionsWin.EncoderMeanSpeedLowerValue);
+		if(myColor != "")
+			(cell as Gtk.CellRendererText).Foreground = myColor;
+		else
+			(cell as Gtk.CellRendererText).Foreground = null;	//will show default color
+
 		//no need of UtilGtk.TVNumPrint, always has 1 digit on left of decimal
 		(cell as Gtk.CellRendererText).Text = 
 			String.Format("{0,12:0.000}",Convert.ToDouble(curve.MeanSpeed));
@@ -477,12 +490,17 @@ public partial class ChronoJumpWindow
 	private void RenderMaxSpeed (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
-		(cell as Gtk.CellRendererText).Foreground = assignColor(
+		string myColor = assignColor(
 				Convert.ToDouble(curve.MaxSpeed),
 				repetitiveConditionsWin.EncoderMaxSpeedHigher, 
 				repetitiveConditionsWin.EncoderMaxSpeedLower, 
 				repetitiveConditionsWin.EncoderMaxSpeedHigherValue,
 				repetitiveConditionsWin.EncoderMaxSpeedLowerValue);
+		if(myColor != "")
+			(cell as Gtk.CellRendererText).Foreground = myColor;
+		else
+			(cell as Gtk.CellRendererText).Foreground = null;	//will show default color
+
 		//no need of UtilGtk.TVNumPrint, always has 1 digit on left of decimal
 		(cell as Gtk.CellRendererText).Text = 
 			String.Format("{0,12:0.000}",Convert.ToDouble(curve.MaxSpeed));
@@ -491,13 +509,17 @@ public partial class ChronoJumpWindow
 	private void RenderMeanPower (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
-		(cell as Gtk.CellRendererText).Foreground = assignColor(
+		string myColor = assignColor(
 				Convert.ToDouble(curve.MeanPower),
 				repetitiveConditionsWin.EncoderPowerHigher, 
 				repetitiveConditionsWin.EncoderPowerLower, 
 				repetitiveConditionsWin.EncoderPowerHigherValue,
 				repetitiveConditionsWin.EncoderPowerLowerValue);
-			
+		if(myColor != "")
+			(cell as Gtk.CellRendererText).Foreground = myColor;
+		else
+			(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));
 	}
@@ -505,12 +527,17 @@ public partial class ChronoJumpWindow
 	private void RenderPeakPower (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
-		(cell as Gtk.CellRendererText).Foreground = assignColor(
+		string myColor = assignColor(
 				Convert.ToDouble(curve.PeakPower),
 				repetitiveConditionsWin.EncoderPeakPowerHigher, 
 				repetitiveConditionsWin.EncoderPeakPowerLower, 
 				repetitiveConditionsWin.EncoderPeakPowerHigherValue,
 				repetitiveConditionsWin.EncoderPeakPowerLowerValue);
+		if(myColor != "")
+			(cell as Gtk.CellRendererText).Foreground = myColor;
+		else
+			(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));
 	}
@@ -518,8 +545,9 @@ public partial class ChronoJumpWindow
 	private void RenderPeakPowerT (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 	{
 		EncoderCurve curve = (EncoderCurve) model.GetValue (iter, 0);
+		double myPPT = Convert.ToDouble(curve.PeakPowerT)/1000; //ms->s
 		(cell as Gtk.CellRendererText).Text = 
-			String.Format(UtilGtk.TVNumPrint(curve.Width,8,3),Convert.ToDouble(curve.PeakPowerT)/1000); //ms->s
+			String.Format(UtilGtk.TVNumPrint(myPPT.ToString(),8,3),myPPT);
 	}
 
 	/* end of rendering cols */