Thread: [Pytrainer-svn] SF.net SVN: pytrainer:[433] pytrainer/trunk (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 433
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=433&view=rev
Author:   jblance
Date:     2009-12-14 10:16:39 +0000 (Mon, 14 Dec 2009)

Log Message:
-----------
Added 'proper' lap support to GPX+ for tcxv2 and garmintools file imports (--gmaps3 to see lap info)

Modified Paths:
--------------
    pytrainer/trunk/plugins/garmin-tcxv2/translate.xsl
    pytrainer/trunk/plugins/garmintools/garmintools.py
    pytrainer/trunk/plugins/garmintools/translate.xsl
    pytrainer/trunk/pytrainer/extensions/googlemaps.py
    pytrainer/trunk/pytrainer/lib/gpx.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/plugins/garmin-tcxv2/translate.xsl
===================================================================

--- pytrainer/trunk/plugins/garmin-tcxv2/translate.xsl	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/plugins/garmin-tcxv2/translate.xsl	2009-12-14 10:16:39 UTC (rev 433)
@@ -58,6 +58,38 @@
         </trkseg><xsl:value-of select="$newline"/>
     </xsl:for-each>
     </trk><xsl:value-of select="$newline"/>
+<!-- Lap Data -->
+	<xsl:value-of select="$newline"/>
+	<extensions><xsl:value-of select="$newline"/>
+    <xsl:for-each select="t:TrainingCenterDatabase/t:Activities/t:Activity/t:Lap">
+    <xsl:variable name="vIndex">
+    <xsl:number count="t:Lap"/>
+    </xsl:variable>
+		<gpxdata:lap><xsl:value-of select="$newline"/>
+			<gpxdata:index><xsl:value-of select="$vIndex"/></gpxdata:index><xsl:value-of select="$newline"/>
+            <xsl:variable name="stlat"><xsl:value-of select="t:Track/t:Trackpoint[1]/t:Position/t:LatitudeDegrees"/></xsl:variable>
+            <xsl:variable name="stlon"><xsl:value-of select="t:Track/t:Trackpoint[1]/t:Position/t:LongitudeDegrees"/></xsl:variable>
+            <gpxdata:startPoint lat="{$stlat}" lon="{$stlon}"/><xsl:value-of select="$newline"/>
+			<xsl:variable name="cnt"><xsl:value-of select="count(t:Track/t:Trackpoint/t:Position)"/></xsl:variable>
+			<xsl:variable name="endlat"><xsl:value-of select="t:Track/t:Trackpoint[number($cnt)]/t:Position/t:LatitudeDegrees"/></xsl:variable>
+   	  	  	<xsl:variable name="endlon"><xsl:value-of select="t:Track/t:Trackpoint[number($cnt)]/t:Position/t:LongitudeDegrees"/></xsl:variable>
+      		<gpxdata:endPoint lat="{$endlat}" lon="{$endlon}"/><xsl:value-of select="$newline"/>
+			<gpxdata:startTime><xsl:value-of select="@StartTime"/></gpxdata:startTime><xsl:value-of select="$newline"/>
+			<gpxdata:elapsedTime><xsl:value-of select="t:TotalTimeSeconds"/></gpxdata:elapsedTime><xsl:value-of select="$newline"/>
+			<gpxdata:calories><xsl:value-of select="t:Calories"/></gpxdata:calories><xsl:value-of select="$newline"/>
+			<gpxdata:distance><xsl:value-of select="t:DistanceMeters"/></gpxdata:distance><xsl:value-of select="$newline"/>
+			<!-- <gpxdata:trackReference>Reference information for the track which corresponds to this lap type="trackReferenceType"</gpxdata:trackReference><xsl:value-of select="$newline"/> -->
+			<gpxdata:summary><xsl:value-of select="$newline"/>
+				<MaximumSpeed kind="max"><xsl:value-of select="t:MaximumSpeed"/></MaximumSpeed><xsl:value-of select="$newline"/>
+				<AverageHeartRateBpm kind="avg"><xsl:value-of select="t:AverageHeartRateBpm/t:Value"/></AverageHeartRateBpm><xsl:value-of select="$newline"/>
+				<MaximumHeartRateBpm kind="max"><xsl:value-of select="t:MaximumHeartRateBpm/t:Value"/></MaximumHeartRateBpm><xsl:value-of select="$newline"/>
+			</gpxdata:summary><xsl:value-of select="$newline"/> 
+			<gpxdata:trigger><xsl:value-of select="t:TriggerMethod"/></gpxdata:trigger><xsl:value-of select="$newline"/>
+			<gpxdata:intensity><xsl:value-of select="t:Intensity"/></gpxdata:intensity><xsl:value-of select="$newline"/>
+		</gpxdata:lap><xsl:value-of select="$newline"/>
+    </xsl:for-each>
+    </extensions><xsl:value-of select="$newline"/>
+
     </gpx><xsl:value-of select="$newline"/>
 </xsl:template>
 </xsl:stylesheet>

Modified: pytrainer/trunk/plugins/garmintools/garmintools.py
===================================================================
--- pytrainer/trunk/plugins/garmintools/garmintools.py	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/plugins/garmintools/garmintools.py	2009-12-14 10:16:39 UTC (rev 433)
@@ -106,7 +106,6 @@
 			sport = sport.capitalize()
 		except:
 			sport = "import"
-		print sport
 		return sport
 
 	def detailsFromFile(self, tree):
@@ -116,7 +115,7 @@
 		if pointElement is not None:
 			#Try to get time from point
 			time = pointElement.get("time")
-			print "TODO first time is different from time used by gpsbabel and has locale embedded" + time
+			print "#TODO first time is different from time used by gpsbabel and has locale embedded: " + time
 			return time
 		return None
 

Modified: pytrainer/trunk/plugins/garmintools/translate.xsl
===================================================================
--- pytrainer/trunk/plugins/garmintools/translate.xsl	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/plugins/garmintools/translate.xsl	2009-12-14 10:16:39 UTC (rev 433)
@@ -46,6 +46,37 @@
         <xsl:value-of select="$newline"/>        
         </trkseg><xsl:value-of select="$newline"/>
     </trk><xsl:value-of select="$newline"/>
+
+<!-- Lap Data -->
+	<xsl:value-of select="$newline"/>
+	<extensions><xsl:value-of select="$newline"/>
+    <xsl:for-each select="root/lap">
+    <xsl:variable name="vIndex">
+    <xsl:number count="lap"/>
+    </xsl:variable>
+		<gpxdata:lap><xsl:value-of select="$newline"/>
+			<gpxdata:index><xsl:value-of select="$vIndex"/></gpxdata:index><xsl:value-of select="$newline"/>
+            <xsl:variable name="stlat"><xsl:value-of select="begin_pos/@lat"/></xsl:variable>
+            <xsl:variable name="stlon"><xsl:value-of select="begin_pos/@lon"/></xsl:variable>
+            <gpxdata:startPoint lat="{$stlat}" lon="{$stlon}"/><xsl:value-of select="$newline"/>
+            <xsl:variable name="endlat"><xsl:value-of select="end_pos/@lat"/></xsl:variable>
+            <xsl:variable name="endlon"><xsl:value-of select="end_pos/@lon"/></xsl:variable>
+            <gpxdata:endPoint lat="{$endlat}" lon="{$endlon}"/><xsl:value-of select="$newline"/>
+			<gpxdata:startTime><xsl:value-of select="@start"/></gpxdata:startTime><xsl:value-of select="$newline"/>
+			<gpxdata:elapsedTime><xsl:value-of select="@duration"/></gpxdata:elapsedTime><xsl:value-of select="$newline"/> <!-- Needs converting to seconds -->
+			<gpxdata:calories><xsl:value-of select="calories"/></gpxdata:calories><xsl:value-of select="$newline"/>
+			<gpxdata:distance><xsl:value-of select="@distance"/></gpxdata:distance><xsl:value-of select="$newline"/>
+			<gpxdata:summary><xsl:value-of select="$newline"/>
+				<MaximumSpeed kind="max"><xsl:value-of select="max_speed"/></MaximumSpeed><xsl:value-of select="$newline"/>
+				<AverageHeartRateBpm kind="avg"><xsl:value-of select="avg_hr"/></AverageHeartRateBpm><xsl:value-of select="$newline"/>
+				<MaximumHeartRateBpm kind="max"><xsl:value-of select="max_hr"/></MaximumHeartRateBpm><xsl:value-of select="$newline"/>
+			</gpxdata:summary><xsl:value-of select="$newline"/> 
+			<gpxdata:trigger><xsl:value-of select="@trigger"/></gpxdata:trigger><xsl:value-of select="$newline"/>
+			<gpxdata:intensity><xsl:value-of select="intensity"/></gpxdata:intensity><xsl:value-of select="$newline"/>
+		</gpxdata:lap><xsl:value-of select="$newline"/>
+    </xsl:for-each>
+    </extensions><xsl:value-of select="$newline"/>
+
     </gpx><xsl:value-of select="$newline"/>
 </xsl:template>
 </xsl:stylesheet>

Modified: pytrainer/trunk/pytrainer/extensions/googlemaps.py
===================================================================
--- pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-14 10:16:39 UTC (rev 433)
@@ -81,7 +81,7 @@
 				points = points.replace("\\","\\\\")
 				if self.useGM3:
 					logging.debug("Using Google Maps version 3 API")
-					laps = gpx.getLaps() # [](elapsedTime, lat, lon)
+					laps = gpx.getLaps() # [](elapsedTime, lat, lon, calories, distance)
 					#"sports.name,date,distance,time,beats,comments,average,calories,id_record,title,upositive,unegative,maxspeed,maxpace,pace,maxbeats"
 					info = self.record.getrecordInfo(id_record)
 					timeHours = int(info[0][3]) / 3600
@@ -191,7 +191,7 @@
 		for lap in laps:
 			lapNumber = laps.index(lap)+1
 			content += "var lap%dmarker = new google.maps.Marker({position: new google.maps.LatLng(%f, %f), icon: lapimage, map: map,  title:\"Lap%d\"}); \n " % (lapNumber, float(lap[1]), float(lap[2]), lapNumber)
-			content += "var lap%d = new google.maps.InfoWindow({content: \"End of lap:%s<br>Elapsed time:%s\" });\n" % (lapNumber, lapNumber, lap[0])
+			content += "var lap%d = new google.maps.InfoWindow({content: \"End of lap:%s<br>Elapsed time:%s<br>Distance:%s<br>Calories:%s\" });\n" % (lapNumber, lapNumber, lap[0], lap[4], lap[3])
 			content += "google.maps.event.addListener(lap%dmarker, 'click', function() { lap%d.open(map,lap%dmarker); });\n" % (lapNumber,lapNumber,lapNumber)
 
 		content += '''

Modified: pytrainer/trunk/pytrainer/lib/gpx.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/gpx.py	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/pytrainer/lib/gpx.py	2009-12-14 10:16:39 UTC (rev 433)
@@ -43,6 +43,10 @@
 calorieTag = gpxdataNS.substitute(tag="calories")
 hrTag = gpxdataNS.substitute(tag="hr")
 cadTag = gpxdataNS.substitute(tag="cadence")
+lapTag = gpxdataNS.substitute(tag="lap")
+endPointTag = gpxdataNS.substitute(tag="endPoint")
+elapsedTimeTag = gpxdataNS.substitute(tag="elapsedTime")
+distanceTag = gpxdataNS.substitute(tag="distance")
 
 class Gpx:
 	def __init__(self, data_path = None, filename = None, trkname = None):
@@ -130,19 +134,18 @@
 		logging.debug(">>")
 		lapInfo = []
 		tree  = self.tree
-		date = tree.findtext(timeTag)
-		startTime = self.getDateTime(date)
-		trksegs = tree.findall(trackSegTag)
-		for trkseg in trksegs:
-			trkpts = trkseg.findall(trackPointTag)
-			trkpt = trkpts[-1]
-			lat = trkpt.get("lat")
-			lon = trkpt.get("lon")
-			temp = trkpt.findtext(timeTag)
-			time = self.getDateTime(temp)
-			elapsedTime = time - startTime
-			#print "Found time: %s, lat: %s lon: %s" % (elapsedTime, lat, lon)
-			lapInfo.append((elapsedTime, lat, lon))
+		#date = tree.findtext(timeTag)
+		#startTime = self.getDateTime(date)
+		laps = tree.findall(lapTag)
+		for lap in laps:
+			endPoint = lap.find(endPointTag)
+			lat = endPoint.get("lat")
+			lon = endPoint.get("lon")
+			elapsedTime = lap.findtext(elapsedTimeTag)
+			calories = lap.findtext(calorieTag)
+			distance = lap.findtext(distanceTag)
+			#print "Found time: %s, lat: %s lon: %s cal: %s dist: %s " % (elapsedTime, lat, lon, calories, distance)
+			lapInfo.append((elapsedTime, lat, lon, calories, distance))
 		return lapInfo
 	
 	def _getValues(self): 
@@ -189,7 +192,6 @@
 			else: 
 				hr = 0
 			#get the cadence (if present)
-			#TODO
 			cadResult = trkpoint.find(cadTag)
 			if cadResult is not None:				
 				cadence = int(cadResult.text)

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-12-14 07:40:08 UTC (rev 432)
+++ pytrainer/trunk/pytrainer/main.py	2009-12-14 10:16:39 UTC (rev 433)
@@ -97,7 +97,7 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.7.0_svn#432"
+		self.version ="1.7.0_svn#433"
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Pytrainer-svn] SF.net SVN: pytrainer:[433] pytrainer/trunk (Page 2)

pytrainer-svn