Menu
▾
▴
pytrainer-svn
|
From: <dg...@us...> - 2009-03-25 18:17:16
|
Revision: 299
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=299&view=rev
Author: dgranda
Date: 2009-03-25 18:16:54 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Logging added for troubleshooting
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2009-03-25 18:14:17 UTC (rev 298)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2009-03-25 18:16:54 UTC (rev 299)
@@ -19,6 +19,7 @@
import gobject
import sys
+import logging
from SimpleGladeApp import *
from popupmenu import PopupMenu
@@ -132,6 +133,7 @@
i+=1
def actualize_recordview(self,record_list):
+ logging.debug(">>")
conf = checkConf()
filename = conf.getValue("conffile")
configuration = XMLParser(filename)
@@ -201,18 +203,24 @@
else:
self.recordview.set_sensitive(0)
+ logging.debug(">>")
def actualize_recordgraph(self,record_list):
+ logging.debug(">>")
if len(record_list)>0:
self.record_vbox.set_sensitive(1)
else:
self.record_vbox.set_sensitive(0)
self.drawarearecord.drawgraph(record_list)
+ logging.debug("<<")
def actualize_heartrategraph(self,record_list):
+ logging.debug(">>")
self.drawareaheartrate.drawgraph(record_list)
+ logging.debug(">>")
def actualize_hrview(self,record_list,zones,is_karvonen_method):
+ logging.debug(">>")
if len(record_list)>0:
record_list=record_list[0]
self.record_zone1.set_text("%s-%s" %(zones[4][0],zones[4][1]))
@@ -230,8 +238,10 @@
self.record_zonesmethod.set_text(_("Percentages method"))
else:
self.recordview.set_sensitive(0)
+ logging.debug("<<")
def actualize_dayview(self,record_list):
+ logging.debug(">>")
conf = checkConf()
filename = conf.getValue("conffile")
configuration = XMLParser(filename)
@@ -300,18 +310,24 @@
else:
self.dayview.set_sensitive(0)
+ logging.debug("<<")
def actualize_daygraph(self,record_list):
+ logging.debug(">>")
if len(record_list)>0:
self.day_vbox.set_sensitive(1)
else:
self.day_vbox.set_sensitive(0)
self.drawareaday.drawgraph(record_list)
+ logging.debug("<<")
def actualize_map(self,id_record):
+ logging.debug(">>")
self.googlemaps.drawMap(id_record)
+ logging.debug("<<")
def actualize_monthview(self,record_list, nameMonth):
+ logging.debug(">>")
self.month_date.set_text(nameMonth)
km = calories = time = average = beats = 0
num_records = len(record_list)
@@ -385,11 +401,15 @@
self.monthview.set_sensitive(1)
else:
self.monthview.set_sensitive(0)
+ logging.debug("<<")
def actualize_monthgraph(self,record_list):
+ logging.debug(">>")
self.drawareamonth.drawgraph(record_list)
+ logging.debug("<<")
def actualize_yearview(self,record_list, year):
+ logging.debug(">>")
self.year_date.set_text("%d" %int(year))
km = calories = time = average = beats = 0
num_records = len(record_list)
@@ -442,11 +462,15 @@
else:
self.yearview.set_sensitive(0)
self.drawareayear.drawgraph([])
+ logging.debug("<<")
def actualize_yeargraph(self,record_list):
+ logging.debug(">>")
self.drawareayear.drawgraph(record_list)
+ logging.debug("<<")
def actualize_listview(self,record_list):
+ logging.debug(">>")
#recod list tiene:
#date,distance,average,title,sports.name,id_record,time,beats,caloriesi
#Laas columnas son:
@@ -482,8 +506,10 @@
)
#self.allRecordTreeView.set_headers_clickable(True)
self.allRecordTreeView.set_model(store)
+ logging.debug("<<")
def actualize_waypointview(self,record_list,default_waypoint,redrawmap = 1):
+ logging.debug(">>")
#redrawmap: indica si tenemos que refrescar tb el mapa. 1 si 0 no
#waypoint list tiene:
#id_waypoint,lat,lon,ele,comment,time,name,sym
@@ -527,6 +553,7 @@
if redrawmap == 1:
self.waypointeditor.createHtml(default_waypoint)
self.waypointeditor.drawMap()
+ logging.debug("<<")
def on_waypointTreeView_button_press(self, treeview, event):
x = int(event.x)
@@ -647,9 +674,11 @@
self.parent.newRecord()
def on_sportlist_changed(self,widget):
+ logging.debug("--")
self.parent.refreshGraphView(self.selected_view)
def on_page_change(self,widget,gpointer,page):
+ logging.debug("--")
if page == 0:
self.selected_view="record"
elif page == 1:
@@ -681,15 +710,19 @@
self.infoarea.show()
def on_day_combovalue_changed(self,widget):
+ logging.debug("--")
self.parent.refreshGraphView(self.selected_view)
def on_month_combovalue_changed(self,widget):
+ logging.debug("--")
self.parent.refreshGraphView(self.selected_view)
def on_year_combovalue_changed(self,widget):
+ logging.debug("--")
self.parent.refreshGraphView(self.selected_view)
def on_calendar_selected(self,widget):
+ logging.debug("--")
if self.block:
self.block = False
else:
@@ -699,6 +732,7 @@
self.parent.refreshGraphView(self.selected_view)
def on_calendar_changemonth(self,widget):
+ logging.debug("--")
self.block = True
self.notebook.set_current_page(2)
self.selected_view="month"
@@ -706,6 +740,7 @@
self.parent.refreshGraphView(self.selected_view)
def on_calendar_next_year(self,widget):
+ logging.debug("--")
self.block = True
self.notebook.set_current_page(3)
self.selected_view="year"
@@ -736,6 +771,7 @@
self.parent.editGpsPlugins()
#hasta aqui revisado
def on_allRecordTreeView_button_press(self, treeview, event):
+ logging.debug(">>")
print "on_allRecordTreeView_"
x = int(event.x)
y = int(event.y)
@@ -756,9 +792,11 @@
elif event.button == 1:
self.notebook.set_current_page(0)
self.parent.refreshGraphView("record")
+ logging.debug("<<")
return False
def actualize_recordTreeView(self, record_list):
+ logging.debug(">>")
iterOne = False
store = gtk.ListStore(
gobject.TYPE_INT,
@@ -778,6 +816,7 @@
self.recordTreeView.set_model(store)
if iterOne:
self.recordTreeView.get_selection().select_iter(iterOne)
+ logging.debug("<<")
#if len(record_list)>0:
def parseFloat(self,string):
@@ -787,9 +826,11 @@
return float(0)
def actualize_calendar(self,record_list):
+ logging.debug(">>")
self.calendar.clear_marks()
for i in record_list:
self.calendar.mark_day(int(i))
+ logging.debug("<<")
def on_about_activate(self,widget):
aboutwindow = About(self.data_path, self.version)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jli...@us...> - 2009-04-04 07:15:01
|
Revision: 314
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=314&view=rev
Author: jliljenfeldt
Date: 2009-04-04 07:15:00 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
One more explicit string casting of potential datetime.date object.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2009-04-04 07:13:41 UTC (rev 313)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2009-04-04 07:15:00 UTC (rev 314)
@@ -190,7 +190,7 @@
self.record_maxpace.set_text("%0.2f" %maxpace)
self.record_sport.set_text(sport)
- self.record_date.set_text(date)
+ self.record_date.set_text(str(date))
hour,min,sec=self.parent.date.second2time(int(record_list[3]))
self.record_hour.set_text("%d" %hour)
self.record_minute.set_text("%d" %min)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-02-15 00:26:17
|
Revision: 762
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=762&view=rev
Author: siggipals
Date: 2011-02-15 00:26:11 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
Fixed #96. Equipment no longer displayed when no record selected.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-02-04 17:57:01 UTC (rev 761)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-02-15 00:26:11 UTC (rev 762)
@@ -297,6 +297,7 @@
#self.record_second.set_text("")
self.record_calories.set_text("")
self.record_title.set_text("")
+ self.label_record_equipment.set_text("")
com_buffer = self.record_comments.get_buffer()
start,end = com_buffer.get_bounds()
com_buffer.set_text("")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-03-15 17:58:54
|
Revision: 770
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=770&view=rev
Author: dgranda
Date: 2011-03-15 17:58:48 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
Fixed issue when calculating pace showing lap info - #109
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-12 01:12:42 UTC (rev 769)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-15 17:58:48 UTC (rev 770)
@@ -150,7 +150,7 @@
{'name':_("Distance"), 'xalign':1.0, 'format_float':'%.1f', 'quantity':'distance'},
{'name':_("Time"), 'xalign':1.0, 'format_duration':True},
{'name':_("Avg speed"), 'format_float':'%.2f', 'quantity':'speed'},
- {'name':_("Avg pace"), 'format_float':'%.2f', 'quantity':'pace'},
+ {'name':_("Avg pace"), 'xalign':1.0, 'quantity':'pace'},
{'name':_("Calories"), 'xalign':1.0},
]
self.create_treeview(self.lapsTreeView,columns)
@@ -385,15 +385,17 @@
gobject.TYPE_FLOAT,
gobject.TYPE_STRING,
gobject.TYPE_FLOAT,
- gobject.TYPE_FLOAT,
+ gobject.TYPE_STRING,
gobject.TYPE_INT,
)
for lap in activity.laps:
t = lap['elapsed_time']
m = lap['distance']
s = m / float(t) * 3.6
+ if s > 0:
+ pace = "%d:%02d" %((3600/s)/60,(3600/s)%60)
iter = store.append()
- store.set(iter, 0, lap['lap_number']+1, 1, m/1000, 2, str(int(float(t))), 3, s, 4, 60/s, 5, lap['calories'])
+ store.set(iter, 0, lap['lap_number']+1, 1, m/1000, 2, str(int(float(t))), 3, s, 4, pace, 5, lap['calories'])
self.lapsTreeView.set_model(store)
self.lapsTreeView.set_rules_hint(True)
self.frame_laps.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-03-16 23:43:57
|
Revision: 771
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=771&view=rev
Author: siggipals
Date: 2011-03-16 23:43:51 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
Respect unit prefs in record lap info
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-15 17:58:48 UTC (rev 770)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-16 23:43:51 UTC (rev 771)
@@ -147,7 +147,7 @@
#create the columns for the laps treeview
columns=[
{'name':_("Lap")},
- {'name':_("Distance"), 'xalign':1.0, 'format_float':'%.1f', 'quantity':'distance'},
+ {'name':_("Distance"), 'xalign':1.0, 'format_float':'%.2f', 'quantity':'distance'},
{'name':_("Time"), 'xalign':1.0, 'format_duration':True},
{'name':_("Avg speed"), 'format_float':'%.2f', 'quantity':'speed'},
{'name':_("Avg pace"), 'xalign':1.0, 'quantity':'pace'},
@@ -391,6 +391,10 @@
for lap in activity.laps:
t = lap['elapsed_time']
m = lap['distance']
+
+ if self.pytrainer_main.profile.getValue("pytraining","prf_us_system") == "True":
+ m = km2miles(m)
+
s = m / float(t) * 3.6
if s > 0:
pace = "%d:%02d" %((3600/s)/60,(3600/s)%60)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-03-20 20:03:56
|
Revision: 775
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=775&view=rev
Author: dgranda
Date: 2011-03-20 20:03:50 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Added column name to identify how laps were triggered
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-19 18:52:20 UTC (rev 774)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-20 20:03:50 UTC (rev 775)
@@ -147,7 +147,7 @@
#create the columns for the laps treeview
columns=[
{'name':_("Lap")},
- {'name':_(" "), 'xalign':0, 'pixbuf':True},
+ {'name':_("Trigger"), 'xalign':0, 'pixbuf':True},
{'name':_("Distance"), 'xalign':1.0, 'format_float':'%.2f', 'quantity':'distance'},
{'name':_("Time"), 'xalign':1.0, 'format_duration':True},
{'name':_("Avg speed"), 'format_float':'%.2f', 'quantity':'speed'},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-03-29 00:35:06
|
Revision: 777
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=777&view=rev
Author: siggipals
Date: 2011-03-29 00:35:00 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
Stop lap data display from failing when no HR data present
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-20 20:04:27 UTC (rev 776)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-03-29 00:35:00 UTC (rev 777)
@@ -427,7 +427,7 @@
pic = gtk.gdk.pixbuf_new_from_file(self.data_path+"glade/trigger_%s.png" % lap['trigger'])
iter = store.append()
- store.set(iter, 0, lap['lap_number']+1, 1, pic, 2, m/1000, 3, str(int(float(t))), 4, s, 5, max_speed, 6, pace, 7, max_pace, 8, lap['avg_hr'], 9, lap['max_hr'], 10, lap['calories'], 11, color[lap['intensity']])
+ store.set(iter, 0, lap['lap_number']+1, 1, pic, 2, m/1000, 3, str(int(float(t))), 4, s, 5, max_speed, 6, pace, 7, max_pace, 8, lap['avg_hr'] if lap['avg_hr'] else 0, 9, lap['max_hr'] if lap['max_hr'] else 0, 10, lap['calories'], 11, color[lap['intensity']])
self.lapsTreeView.set_model(store)
self.lapsTreeView.set_rules_hint(True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ilo...@us...> - 2011-05-08 20:11:07
|
Revision: 793
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=793&view=rev
Author: ilovesquigly
Date: 2011-05-08 20:11:00 +0000 (Sun, 08 May 2011)
Log Message:
-----------
Division by zero bug fix
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-08 17:26:44 UTC (rev 792)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-08 20:11:00 UTC (rev 793)
@@ -1310,10 +1310,11 @@
c += 1
store.set (iter, c, s['total_'+f])
c += 1
- store.set (iter, c, s['total_distance'] / s['total_duration'] * 3600.)
- for f in data['fields']:
- c += 1
- store.set (iter, c, s[f])
+ if s['total_duration']!=0: # Avoid division by zero if 0 length sport activity exists in DB
+ store.set (iter, c, s['total_distance'] / s['total_duration'] * 3600.)
+ for f in data['fields']:
+ c += 1
+ store.set (iter, c, s[f])
self.statsTreeView.set_model(store)
self.statsTreeView.set_rules_hint(True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ilo...@us...> - 2011-05-08 20:18:57
|
Revision: 794
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=794&view=rev
Author: ilovesquigly
Date: 2011-05-08 20:18:51 +0000 (Sun, 08 May 2011)
Log Message:
-----------
Division by zero bug fix
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-08 20:11:00 UTC (rev 793)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-08 20:18:51 UTC (rev 794)
@@ -1142,7 +1142,7 @@
tbeats = tbeats/time_in_min
else:
tbeats = 0
- if km > 0:
+ if km > 0 and time > 0: # time can be zero when a new year starts
average = (km/(time/3600))
else:
average = 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-05-10 00:27:01
|
Revision: 798
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=798&view=rev
Author: siggipals
Date: 2011-05-10 00:26:55 +0000 (Tue, 10 May 2011)
Log Message:
-----------
Fixed bug in lap comment tooltip signal handling
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-10 00:05:19 UTC (rev 797)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-10 00:26:55 UTC (rev 798)
@@ -413,7 +413,7 @@
self.label_record_equipment.set_text(equipment_text)
else:
self.label_record_equipment.set_markup("<i>None</i>")
- runTime = 0.0;
+ runTime = 0.0;
if len(activity.laps)>1:
store = gtk.ListStore(
gobject.TYPE_INT,
@@ -485,13 +485,15 @@
path = self.lapsTreeView.get_path_at_pos(x,y-20)
if not path: return False
if path[1] != self.lapsTreeView.get_columns()[12]: return False
- comments = activity.laps[path[0][0]]['comments']
+ comments = user_param1[1].laps[path[0][0]]['comments']
if comments and len(comments)>40:
tooltip.set_text(comments)
return True
return False
- self.lapsTreeView.connect('query-tooltip', show_tooltip, (store, activity))
+ if getattr(self.lapsTreeView, 'tooltip_handler_id', None):
+ self.lapsTreeView.disconnect(self.lapsTreeView.tooltip_handler_id)
+ self.lapsTreeView.tooltip_handler_id = self.lapsTreeView.connect('query-tooltip', show_tooltip, (store, activity))
i = 0
for cr in self.lapsTreeView.get_columns()[12].get_cell_renderers():
cr.set_property('editable', True)
@@ -1310,7 +1312,7 @@
c += 1
store.set (iter, c, s['total_'+f])
c += 1
- if s['total_duration']!=0: # Avoid division by zero if 0 length sport activity exists in DB
+ if s['total_duration']!=0: # Avoid division by zero if 0 length sport activity exists in DB
store.set (iter, c, s['total_distance'] / s['total_duration'] * 3600.)
for f in data['fields']:
c += 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-05-17 00:06:33
|
Revision: 799
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=799&view=rev
Author: siggipals
Date: 2011-05-17 00:06:27 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Fixed indent bug
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-10 00:26:55 UTC (rev 798)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-17 00:06:27 UTC (rev 799)
@@ -1312,11 +1312,11 @@
c += 1
store.set (iter, c, s['total_'+f])
c += 1
- if s['total_duration']!=0: # Avoid division by zero if 0 length sport activity exists in DB
- store.set (iter, c, s['total_distance'] / s['total_duration'] * 3600.)
- for f in data['fields']:
- c += 1
- store.set (iter, c, s[f])
+ if s['total_duration']!=0: # Avoid division by zero if 0 length sport activity exists in DB
+ store.set (iter, c, s['total_distance'] / s['total_duration'] * 3600.)
+ for f in data['fields']:
+ c += 1
+ store.set (iter, c, s[f])
self.statsTreeView.set_model(store)
self.statsTreeView.set_rules_hint(True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-05-17 23:45:46
|
Revision: 801
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=801&view=rev
Author: siggipals
Date: 2011-05-17 23:45:40 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Count days when displaying duration > 24 hours.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-17 22:32:25 UTC (rev 800)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-17 23:45:40 UTC (rev 801)
@@ -309,6 +309,11 @@
new = orig[4:]
elif orig[:3] == ' 0:':
new = orig[3:]
+ if len(new)>5:
+ hours = int(new[:-6])
+ days = _("d")
+ if hours>23:
+ new = "%d %s %02d:%s" % (hours / 24, days, hours%24 ,new[-5:])
cell.set_property('text', new)
def render_float(self, column, cell, model, iter, data):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-06-08 23:45:14
|
Revision: 806
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=806&view=rev
Author: siggipals
Date: 2011-06-08 23:45:08 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
#128
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-05-20 10:00:46 UTC (rev 805)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-06-08 23:45:08 UTC (rev 806)
@@ -2072,6 +2072,7 @@
2, duration,
3, distance
)
+ store.set_sort_column_id(1, gtk.SORT_ASCENDING)
self.recordTreeView.set_model(store)
if iterOne:
self.recordTreeView.get_selection().select_iter(iterOne)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-06-23 00:30:25
|
Revision: 808
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=808&view=rev
Author: siggipals
Date: 2011-06-23 00:30:19 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Support US units and display units in analytics view
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-06-10 18:11:20 UTC (rev 807)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-06-23 00:30:19 UTC (rev 808)
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
#Copyright (C) Fiz Vazquez vu...@si...
# Modified by dgranda
@@ -853,12 +856,15 @@
import numpy
speeds = [r['average'] for r in records]
- self.label_ranking_range.set_text("%.2f - %.2f" % (activity.distance * (1-percentage), activity.distance * (1+percentage)))
+ if self.pytrainer_main.profile.prf_us_system:
+ self.label_ranking_range.set_text("%.2f - %.2f %s" % (km2miles(activity.distance * (1-percentage)), km2miles(activity.distance * (1+percentage)), activity.distance_unit))
+ else:
+ self.label_ranking_range.set_text("%.2f - %.2f %s" % (activity.distance * (1-percentage), activity.distance * (1+percentage), activity.distance_unit))
self.label_ranking_rank.set_text("%s/%s" % (count, len(records)))
- self.label_ranking_avg.set_text("%.2f" % numpy.average(speeds))
- self.label_ranking_speed.set_text("%.2f" % activity.average)
- self.label_ranking_stddev.set_text("%.4f" % numpy.std(speeds))
- self.label_ranking_dev.set_text("%+f" % ((activity.average - numpy.average(speeds)) / numpy.std(speeds)))
+ self.label_ranking_avg.set_text("%.2f %s" % (km2miles(numpy.average(speeds)) if self.pytrainer_main.profile.prf_us_system else numpy.average(speeds), activity.speed_unit))
+ self.label_ranking_speed.set_text("%.2f %s" % (km2miles(activity.average) if self.pytrainer_main.profile.prf_us_system else activity.average, activity.speed_unit))
+ self.label_ranking_stddev.set_text("%.4f" % (km2miles(numpy.std(speeds)) if self.pytrainer_main.profile.prf_us_system else numpy.std(speeds)))
+ self.label_ranking_dev.set_text("%+.2fσ" % ((activity.average - numpy.average(speeds)) / numpy.std(speeds)))
rank_store = gtk.ListStore(
gobject.TYPE_INT, #id
@@ -886,13 +892,12 @@
0, i,
1, rank,
2, r['date'],
- 3, r['distance'],
+ 3, km2miles(r['distance']) if self.pytrainer_main.profile.prf_us_system else r['distance'],
4, str(r['time']),
5, r['average'],
6, '#3AA142' if rank==count else '#000000',
)
- # Use grey color for "rest" laps
for c in self.rankingTreeView.get_columns()[:-1]:
for cr in c.get_cell_renderers():
if type(cr)==gtk.CellRendererText:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sig...@us...> - 2011-07-18 00:55:54
|
Revision: 811
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=811&view=rev
Author: siggipals
Date: 2011-07-18 00:55:48 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
Fixed Jan-Friso's "issue #2":
2) Run/Rest times are not calculated for acitivities with only one
lap.
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-07-18 00:47:43 UTC (rev 810)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-07-18 00:55:48 UTC (rev 811)
@@ -517,7 +517,7 @@
self.frame_laps.show()
else:
self.frame_laps.hide()
- runTime = activity.time
+ runTime = float(activity.laps[0]['elapsed_time'])
else:
self.recordview.set_current_page(0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-08-14 20:01:47
|
Revision: 846
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=846&view=rev
Author: dgranda
Date: 2011-08-14 20:01:41 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
Enabling localization for some graph labels
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-08-14 10:15:38 UTC (rev 845)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-08-14 20:01:41 UTC (rev 846)
@@ -558,10 +558,10 @@
if isinstance(child, gtk.Frame):
self.graph_data_hbox.remove(child)
#Build frames and vboxs to hold checkbuttons
- xFrame = gtk.Frame(label="Show on X Axis")
- y1Frame = gtk.Frame(label="Show on Y1 Axis")
- y2Frame = gtk.Frame(label="Show on Y2 Axis")
- limitsFrame = gtk.Frame(label="Axis Limits")
+ xFrame = gtk.Frame(label=_("Show on X Axis"))
+ y1Frame = gtk.Frame(label=_("Show on Y1 Axis"))
+ y2Frame = gtk.Frame(label=_("Show on Y2 Axis"))
+ limitsFrame = gtk.Frame(label=_("Axis Limits"))
xvbox = gtk.VBox()
y1box = gtk.Table()
y2box = gtk.Table()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-09-07 10:29:26
|
Revision: 878
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=878&view=rev
Author: dgranda
Date: 2011-09-07 10:29:20 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Added zero padding to overcome lap order issue - ticket:145
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-09-07 10:24:19 UTC (rev 877)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-09-07 10:29:20 UTC (rev 878)
@@ -2053,7 +2053,7 @@
if laps is not None:
for lap in laps:
#"id_lap, record, elapsed_time, distance, start_lat, start_lon, end_lat, end_lon, calories, lap_number",
- lapNumber = "%s%d" % ( _("lap"), int(lap[9])+1 )
+ lapNumber = "%s %02d" % ( _("lap"), int(lap[9])+1 )
if self.pytrainer_main.profile.prf_us_system:
dist = km2miles(lap[3])
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2011-10-24 19:09:06
|
Revision: 908
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=908&view=rev
Author: dgranda
Date: 2011-10-24 19:09:00 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Support for 'resting' intensity lap status in imported activities coming from TCXv2 files
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2011-10-24 19:05:49 UTC (rev 907)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2011-10-24 19:09:00 UTC (rev 908)
@@ -462,6 +462,7 @@
color = {
'active' : '#000000',
'rest' : '#808080',
+ 'resting' : '#808080',
}
pic = gtk.gdk.pixbuf_new_from_file(self.data_path+"glade/trigger_%s.png" % lap['laptrigger'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X