[Pytrainer-svn] SF.net SVN: pytrainer:[417] pytrainer/trunk/pytrainer

[<jb...@us...>]

Revision: 417
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=417&view=rev
Author:   jblance
Date:     2009-12-01 09:56:12 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Some interim lap progress 

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/extensions/googlemaps.py
    pytrainer/trunk/pytrainer/lib/gpx.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/pytrainer/extensions/googlemaps.py
===================================================================
--- pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-01 09:41:27 UTC (rev 416)
+++ pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-01 09:56:12 UTC (rev 417)
@@ -189,9 +189,9 @@
 			});\n'''
 
 		for lap in laps:
-			lapNumber = laps.index(lap)
+			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+1, lap[0])
+			content += "var lap%d = new google.maps.InfoWindow({content: \"End of lap:%s<br>Elapsed time:%s\" });\n" % (lapNumber, lapNumber, lap[0])
 			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-01 09:41:27 UTC (rev 416)
+++ pytrainer/trunk/pytrainer/lib/gpx.py	2009-12-01 09:56:12 UTC (rev 417)
@@ -126,7 +126,7 @@
 			temp = trkpt.findtext(timeTag)
 			time = datetime.strptime(temp, "%Y-%m-%dT%H:%M:%SZ")
 			elapsedTime = time - startTime
-			print "Found time: %s, lat: %s lon: %s" % (elapsedTime, lat, lon)
+			#print "Found time: %s, lat: %s lon: %s" % (elapsedTime, lat, lon)
 			lapInfo.append((elapsedTime, lat, lon))
 		return lapInfo
 	

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-12-01 09:41:27 UTC (rev 416)
+++ pytrainer/trunk/pytrainer/main.py	2009-12-01 09:56:12 UTC (rev 417)
@@ -97,7 +97,7 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.6.0.9_svn#416"
+		self.version ="1.6.0.9_svn#417"
 		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.