Menu
▾
▴
pytrainer-svn
|
From: <jli...@us...> - 2009-04-04 07:13:43
|
Revision: 313
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=313&view=rev
Author: jliljenfeldt
Date: 2009-04-04 07:13:41 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Explicit string casting of potential datetime.date object.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2009-04-03 16:59:52 UTC (rev 312)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2009-04-04 07:13:41 UTC (rev 313)
@@ -141,7 +141,7 @@
#(50, u'2006-10-13', 1, 25.0, u'5625', 0.0, 16.0, 0, u'', gpsfile, title,upositive,unegative,maxspeed|maxpace|pace|maxbeats
self.id_record = values[0]
self.setTime(values[4])
- self.rcd_date.set_text(values[1])
+ self.rcd_date.set_text(str(values[1]))
self.setValue("rcd_distance",values[3])
self.setValue("rcd_average",values[6])
self.setValue("rcd_calories",values[7])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aza...@us...> - 2010-11-14 13:36:48
|
Revision: 710
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=710&view=rev
Author: azapletal
Date: 2010-11-14 13:36:37 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Reverted uc usage in windowrecord. Needs better handling of empty/None values.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2010-11-14 11:13:26 UTC (rev 709)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2010-11-14 13:36:37 UTC (rev 710)
@@ -256,25 +256,18 @@
trackSummary = {}
list_options["rcd_date"] = self.rcd_date.get_text()
list_options["rcd_sport"] = self.rcd_sport.get_active_text()
- list_options["rcd_distance"] = self.uc.usr2sys('distance', self.rcd_distance.get_text())
+ list_options["rcd_distance"] = self.rcd_distance.get_text()
list_options["rcd_beats"] = self.rcd_beats.get_text()
- list_options["rcd_average"] = self.uc.usr2sys('speed', self.rcd_average.get_text())
+ list_options["rcd_average"] = self.rcd_average.get_text()
list_options["rcd_calories"] = self.rcd_calories.get_text()
list_options["rcd_title"] = self.rcd_title.get_text().replace("\"","'")
list_options["rcd_gpxfile"] = self.rcd_gpxfile.get_text()
- list_options["rcd_upositive"] = self.uc.usr2sys('height', self.rcd_upositive.get_text())
- list_options["rcd_unegative"] = self.uc.usr2sys('height', self.rcd_unegative.get_text())
+ list_options["rcd_upositive"] = self.rcd_upositive.get_text()
+ list_options["rcd_unegative"] = self.rcd_unegative.get_text()
list_options["rcd_maxbeats"] = self.rcd_maxbeats.get_text()
-
- # tricky for uc as rcd_pace is in min:sec
- _p1 = self.parent.pace_to_float(self.rcd_pace.get_text())
- _p2 = self.parent.pace_from_float(self.uc.pace(_p1))
- list_options["rcd_pace"] = _p2 #self.rcd_pace.get_text()
- _p1 = self.parent.pace_to_float(self.rcd_maxpace.get_text())
- _p2 = self.parent.pace_from_float(self.uc.pace(_p1))
- list_options["rcd_maxpace"] = _p2#self.rcd_maxpace.get_text()
-
- list_options["rcd_maxvel"] = self.uc.usr2sys('speed', self.rcd_maxvel.get_text())
+ list_options["rcd_pace"] = self.rcd_pace.get_text()
+ list_options["rcd_maxpace"] = self.rcd_maxpace.get_text()
+ list_options["rcd_maxvel"] = self.rcd_maxvel.get_text()
list_options["rcd_time"] = [self.rcd_hour.get_value_as_int(),self.rcd_min.get_value_as_int(),self.rcd_second.get_value_as_int()]
buffer = self.rcd_comments.get_buffer()
start,end = buffer.get_bounds()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-08-28 11:40:05
|
Revision: 866
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=866&view=rev
Author: dgranda
Date: 2011-08-28 11:39:59 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Equipment was missing when importing activity from file - ticket:137
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-08-28 11:20:48 UTC (rev 865)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-08-28 11:39:59 UTC (rev 866)
@@ -248,7 +248,8 @@
activity["rcd_title"] = activity["rcd_title"].replace("\"","'")
#Add activity to DB etc
laps = activity.pop("laps", ())
- self.activity_data[index]["db_id"] = self.parent.insertRecord(activity, laps)
+ selected_equipment_ids = self._get_selected_equipment_ids()
+ self.activity_data[index]["db_id"] = self.parent.insertRecord(activity, laps, equipment=selected_equipment_ids)
row += 1
logging.debug("Processed %d rows of activity data" % row)
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nc...@us...> - 2011-09-07 13:09:46
|
Revision: 879
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=879&view=rev
Author: ncjones
Date: 2011-09-07 13:09:39 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Convert activity date to string.
ticket:146
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-09-07 10:29:20 UTC (rev 878)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-09-07 13:09:39 UTC (rev 879)
@@ -353,7 +353,7 @@
self.rcd_hour.set_value(h)
self.rcd_min.set_value(m)
self.rcd_second.set_value(s)
- self.rcd_date.set_text(activity.date)
+ self.rcd_date.set_text(str(activity.date))
#self.rcd_distance.set_text("%.2f"%activity.distance)
#myset_text(self.rcd_distance, 'distance', activity.distance, us=self.us, round=2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-11-04 18:47:45
|
Revision: 918
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=918&view=rev
Author: dgranda
Date: 2011-11-04 18:47:39 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Syncing calculations of distance, time, speed and pace - ticket #152
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-11-04 18:44:51 UTC (rev 917)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-11-04 18:47:39 UTC (rev 918)
@@ -19,6 +19,7 @@
from __future__ import division
import os
import logging
+import traceback
import gtk, gobject
from SimpleGladeApp import SimpleGladeApp
from windowcalendar import WindowCalendar
@@ -442,13 +443,29 @@
return None
def on_calctime_clicked(self,widget):
+ logging.debug(">>")
try:
- distance = self.rcd_distance.get_text()
- average = self.rcd_average.get_text()
- time_in_hour = float(distance)/float(average)
+ distance = float(self.rcd_distance.get_text()) # distance is mandatory!
+ # we need either pace or speed
+ try:
+ average = float(self.rcd_average.get_text())
+ time_in_hour = distance/average
+ logging.debug("Distance: %0.3f km (mi) | Speed: %0.2f -> Time: %.f hours " %(distance,average,time_in_hour))
+ pace = self.parent.pace_from_float(60/average)
+ logging.debug("Setting pace: %s" %pace)
+ self.rcd_pace.set_text(pace)
+ except:
+ pace_dec = self.parent.pace_to_float(self.rcd_pace.get_text())
+ time_in_hour = pace_dec*distance/60.0
+ logging.debug("Distance: %0.3f km (mi) | Pace_dec: %0.2f -> Time: %.f hours" %(distance,pace_dec,time_in_hour))
+ speed = distance/time_in_hour
+ logging.debug("Setting average speed: %0.2f" %speed)
+ self.rcd_average.set_text("%0.2f" %speed)
self.set_recordtime(time_in_hour)
except:
+ logging.debug("Traceback: %s" % traceback.format_exc())
pass
+ logging.debug("<<")
def update_activity_data(self, row, gpx_file, sport):
self.activity_data[row]["rcd_comments"] = ""
@@ -634,7 +651,7 @@
logging.debug("Average pace: %s" %pace)
self.rcd_pace.set_text(pace)
logging.debug("<<")
-
+
def on_calccalories_clicked(self,widget):
sport = self.rcd_sport.get_active_text()
hour = self.rcd_hour.get_value_as_int()
@@ -660,17 +677,33 @@
self.rcd_calories.set_text(str(calories))
def on_calcdistance_clicked(self,widget):
+ logging.debug(">>")
try:
hour = self.rcd_hour.get_value_as_int()
min = self.rcd_min.get_value_as_int()
sec = self.rcd_second.get_value_as_int()
time = sec + (min*60) + (hour*3600)
time_in_hour = time/3600.0
- average = float(self.rcd_average.get_text())
- distance = average*time_in_hour
+ # we need either pace or speed
+ try:
+ average = float(self.rcd_average.get_text())
+ distance = average*time_in_hour
+ logging.debug("Time: %d seconds | Speed: %0.2f -> Distance: %0.3f km (mi)" %(time,average,distance))
+ pace = self.parent.pace_from_float(60/average)
+ logging.debug("Setting pace: %s" %pace)
+ self.rcd_pace.set_text(pace)
+ except:
+ pace_dec = self.parent.pace_to_float(self.rcd_pace.get_text())
+ distance = time/(60.0*pace_dec)
+ logging.debug("Time: %d seconds | Pace_dec: %0.2f -> Distance: %0.3f km (mi)" %(time,pace_dec,distance))
+ speed = distance/time_in_hour
+ logging.debug("Setting average speed: %0.2f" %speed)
+ self.rcd_average.set_text("%0.2f" %speed)
self.set_distance(distance)
except:
+ logging.debug("Traceback: %s" % traceback.format_exc())
pass
+ logging.debug("<<")
def set_distance(self,distance):
self.rcd_distance.set_text("%0.2f" %distance)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-11-05 13:09:52
|
Revision: 922
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=922&view=rev
Author: dgranda
Date: 2011-11-05 13:09:46 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Pace values now match mixed format when adding or editing activities without GPX file - ticket #152
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowrecord.py
Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-11-04 20:52:39 UTC (rev 921)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py 2011-11-05 13:09:46 UTC (rev 922)
@@ -268,8 +268,11 @@
list_options["rcd_upositive"] = self.uc.usr2sys_str('height', self.rcd_upositive.get_text())
list_options["rcd_unegative"] = self.uc.usr2sys_str('height', self.rcd_unegative.get_text())
list_options["rcd_maxbeats"] = self.rcd_maxbeats.get_text()
- list_options["rcd_pace"] = self.uc.usr2sys_str('pace', self.rcd_pace.get_text())
- list_options["rcd_maxpace"] = self.uc.usr2sys_str('pace', self.rcd_maxpace.get_text())
+ # 2011.11.05 - dgranda
+ # Pace is shown to user in mm:ss format
+ # But pace in database is stored in a mixed way: 4.30 for 4:30 (4.5 in 'decimal'). This needs to be changed!!
+ list_options["rcd_pace"] = self.uc.usr2sys_str('pace', self.rcd_pace.get_text().replace(":","."))
+ list_options["rcd_maxpace"] = self.uc.usr2sys_str('pace', self.rcd_maxpace.get_text().replace(":","."))
list_options["rcd_maxvel"] = self.uc.usr2sys_str('speed', self.rcd_maxvel.get_text())
list_options["rcd_time"] = [self.rcd_hour.get_value_as_int(),self.rcd_min.get_value_as_int(),self.rcd_second.get_value_as_int()]
buffer = self.rcd_comments.get_buffer()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X