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

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

Revision: 415
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=415&view=rev
Author:   jblance
Date:     2009-11-30 10:02:45 +0000 (Mon, 30 Nov 2009)

Log Message:
-----------
Added info windows to Google Maps version 3 api code

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

Modified: pytrainer/trunk/pytrainer/extensions/googlemaps.py
===================================================================
--- pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-11-30 06:58:09 UTC (rev 414)
+++ pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-11-30 10:02:45 UTC (rev 415)
@@ -25,6 +25,7 @@
 from pytrainer.lib.gpx import Gpx
 import pytrainer.lib.points as Points 
 from pytrainer.lib.fileUtils import fileUtils
+from pytrainer.record import Record
 
 class Googlemaps:
 	def __init__(self, data_path = None, vbox = None, waypoint = None, useGM3 = False):
@@ -38,6 +39,7 @@
 		self.htmlfile = "%s/index.html" % (self.conf.getValue("tmpdir")) 
 		self.waypoint=waypoint
 		self.useGM3 = useGM3
+		self.record = Record()
 		logging.debug("<<")
 	
 	def drawMap(self,id_record):
@@ -79,8 +81,13 @@
 				points = points.replace("\\","\\\\")
 				if self.useGM3:
 					logging.debug("Using Google Maps version 3 API")
-					startinfo = "Start<br>TODO: Put ??? info here"
-					finishinfo = "End<br>TODO: Put summary info here?"
+					#"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
+					timeMin = (float(info[0][3]) / 3600.0 - timeHours) * 60
+					time = "%d%s %02d%s" % (timeHours, _("h"), timeMin, _("min"))
+					startinfo = "<div id='info_content'>%s: %s</div>" % (info[0][0], info[0][9])
+					finishinfo = "<div id='info_content'>%s: %s<br>%s: %s%s</div>" % (_("Time"), time, _("Distance"), info[0][2], _("km"))
 					self.createHtml_api3(polyline, minlat, minlon, maxlat, maxlon, startinfo, finishinfo)
 				else:
 					logging.debug("Using Google Maps version 2 API")

Modified: pytrainer/trunk/pytrainer/lib/date.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/date.py	2009-11-30 06:58:09 UTC (rev 414)
+++ pytrainer/trunk/pytrainer/lib/date.py	2009-11-30 10:02:45 UTC (rev 415)
@@ -59,7 +59,7 @@
 			Problems as python date functions do not respect locale (i.e. Sunday is always start of week????)
 			Note: %w gives weekday as a decimal number [0(Sunday),6(Saturday)].
 		'''
-		if prf_us_system == "True":
+		if prf_us_system:
 			#Sunday is first day of week
 			weekDate = datetime.datetime.strptime(date, "%Y-%m-%d")
 			dayOfWeek = int(weekDate.strftime("%w"))

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-11-30 06:58:09 UTC (rev 414)
+++ pytrainer/trunk/pytrainer/main.py	2009-11-30 10:02:45 UTC (rev 415)
@@ -50,7 +50,6 @@
 #from gui.windowextensions import WindowExtensions
 from gui.windowmain import Main
 from gui.warning import Warning
-from lib.system import checkConf
 from lib.date import Date
 from lib.gpx import Gpx
 from lib.soapUtils import webService
@@ -98,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#414"
+		self.version ="1.6.0.9_svn#415"
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?
@@ -119,7 +118,10 @@
 		self.filename = self.conf.getValue("conffile")
 		logging.debug('retrieving data from '+ self.filename)
 		self.configuration = XMLParser(self.filename)
-		self.prf_us_system = self.configuration.getValue("pytraining","prf_us_system")
+		if self.configuration.getValue("pytraining","prf_us_system") == "True":
+			self.prf_us_system = True
+		else:
+			self.prf_us_system = False
 		self.ddbb = DDBB(self.configuration)
 		logging.debug('connecting to DDBB')
 		self.ddbb.connect()		


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