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

[<dg...@us...>]

Revision: 928
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=928&view=rev
Author:   dgranda
Date:     2011-11-12 20:46:28 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Fixed pace format issue when retrieving values from DB

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/gui/windowrecord.py
    pytrainer/trunk/pytrainer/record.py

Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py	2011-11-12 16:04:26 UTC (rev 927)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py	2011-11-12 20:46:28 UTC (rev 928)
@@ -371,8 +371,8 @@
         self.rcd_upositive.set_text("%.2f" %self.uc.height(activity.upositive))
         self.rcd_unegative.set_text("%.2f" %self.uc.height(activity.unegative))
         self.rcd_maxvel.set_text("%.2f" %self.uc.speed(activity.maxspeed))
-        self.rcd_maxpace.set_text("%s" %self.parent.pace_from_float(self.uc.pace(activity.maxpace)))
-        self.rcd_pace.set_text("%s" %self.parent.pace_from_float(self.uc.pace(activity.pace)))
+        self.rcd_maxpace.set_text("%s" %self.parent.pace_from_float(self.uc.pace(activity.maxpace),True)) # value coming from DB
+        self.rcd_pace.set_text("%s" %self.parent.pace_from_float(self.uc.pace(activity.pace),True)) # value coming from DB
         self.rcd_maxbeats.set_text("%s"%activity.maxbeats)
         self.rcd_title.set_text(activity.title)
         

Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py	2011-11-12 16:04:26 UTC (rev 927)
+++ pytrainer/trunk/pytrainer/record.py	2011-11-12 20:46:28 UTC (rev 928)
@@ -96,15 +96,18 @@
 				value = None
 		return value
 
-	def pace_from_float(self, value):
+	def pace_from_float(self, value, fromDB=False):
 		'''Helper to generate mm:ss from float representation mm.ss (or mm,ss?)'''
 		#Check that value supplied is a float
 		try:
 			_value = "%0.2f" % float(value)
 		except ValueError:
 			_value = str(value)
-		mins, sec_dec = _value.split(".")
-		pace = mins + ":" + "%02d" %round(int(sec_dec)*3/5)
+		if fromDB:  # paces in DB are stored in mixed format -> 4:30 as 4.3 (NOT as 4.5 aka 'decimal')
+			pace = _value
+		else:
+			mins, sec_dec = _value.split(".")
+			pace = mins + ":" + "%02d" %round(int(sec_dec)*3/5)
 		return pace
 
 	def _formatRecordNew (self, list_options):
@@ -268,7 +271,7 @@
 		logging.debug('<<')
 		return summaryRecord, laps
 
-	def updateRecord(self, list_options, id_record, equipment=None):
+	def updateRecord(self, list_options, id_record, equipment=None): # ToDo: update only fields that can change if GPX file is present
 		logging.debug('>>')
 		#Remove activity from pool so data is updated
 		self.pytrainer_main.activitypool.remove_activity(id_record)

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