[chronojump] Fixed 645956 - Export correctly speed of runs

[Xavier de Blas <xaviblas src gnome org>]

commit 5eb857151f756aa5cef1f36f7b5f13519b91488e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Apr 8 14:59:54 2011 +0200

    Fixed 645956 - Export correctly speed of runs

 src/exportSession.cs |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/src/exportSession.cs b/src/exportSession.cs
index 8096a12..83db7b8 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -554,10 +554,17 @@ public class ExportSession
 			}
 
 			string [] myStr = runString.Split(new char[] {':'});
+
+			RunType myRunType = new RunType();
+			string myRunTypeString = myStr[4];
+			string myRunDistanceInterval = myStr[7];
+			if(myRunDistanceInterval == "-1" || myRunDistanceInterval == "-1.0") {
+				myRunType = SqliteRunIntervalType.SelectAndReturnRunIntervalType(myRunTypeString);
+			}
 			myData.Add (
 					myStr[2] + ":" +    			//personID
 					myStr[0] + ":" +  myStr[1] + ":" +  	//person.name, run.uniqueID
-					myStr[4] + ":" +  Util.TrimDecimals(myStr[5], dec) + ":" + 	//run.type, run.distancetotal
+					myRunTypeString + ":" +  Util.TrimDecimals(myStr[5], dec) + ":" + 	//run.type, run.distancetotal
 					Util.TrimDecimals(myStr[6], dec) + ":" +  		//run.timetotal
 					Util.TrimDecimals(Util.GetSpeed(myStr[5], myStr[6], true), dec) + ":" + 	//speed AVG in m/s(true)
 					myStr[7] + ":" + 	 	//run.distanceInterval
@@ -595,8 +602,16 @@ public class ExportSession
 				
 				int count = 1;
 				foreach(string myTime in timeString) {
-					myData.Add((count++).ToString() + ":" + 
-							Util.TrimDecimals(Util.GetSpeed(myStr[7], myTime, true), dec) + ":" + //true for: m/s
+					string myDistance = myStr[7];
+					string myShowDistance = "";
+					if(myRunDistanceInterval == "-1" || myRunDistanceInterval == "-1.0") {
+						myDistance = Util.GetRunIVariableDistancesStringRow(
+								myRunType.DistancesString, count -1).ToString();
+						myShowDistance = " (" + myDistance.ToString() + "m)";
+					}
+
+					myData.Add((count++).ToString() + myShowDistance + ":" + 
+							Util.TrimDecimals(Util.GetSpeed(myDistance, myTime, true), dec) + ":" + //true for: m/s
 							Util.TrimDecimals(myTime, dec)
 						  );
 				}