Menu
▾
▴
[Pytrainer-svn] SF.net SVN: pytrainer:[661] pytrainer/trunk/pytrainer
|
From: <jb...@us...> - 2010-10-12 20:30:02
|
Revision: 661
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=661&view=rev
Author: jblance
Date: 2010-10-12 20:29:55 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
Committing Arnd updates to listview
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/windowmain.py
pytrainer/trunk/pytrainer/lib/listview.py
pytrainer/trunk/pytrainer/main.py
pytrainer/trunk/pytrainer/record.py
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2010-10-12 10:30:51 UTC (rev 660)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2010-10-12 20:29:55 UTC (rev 661)
@@ -1054,7 +1054,7 @@
self.listsearch.past = self.lsa_past.get_active()
self.listsearch.duration = self.lsa_duration.get_active()
self.listsearch.distance = self.lsa_distance.get_active()
- self.parent.searchListView(self.listsearch.condition)
+ self.parent.refreshListView(self.listsearch.condition)
def create_menulist(self,column_names):
i=0
@@ -1444,7 +1444,8 @@
self.classicarea.hide()
self.athletearea.hide()
self.selected_view = "listview"
- self.parent.refreshListView()
+ #self.parent.refreshListView()
+ self.parent.refreshListView(self.listsearch.condition)
self.listarea.show()
def on_athleteview_activate(self,widget):
Modified: pytrainer/trunk/pytrainer/lib/listview.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/listview.py 2010-10-12 10:30:51 UTC (rev 660)
+++ pytrainer/trunk/pytrainer/lib/listview.py 2010-10-12 20:29:55 UTC (rev 661)
@@ -9,10 +9,12 @@
def __init__(self, parent = None, pytrainer_main = None):
self.parent = parent
self.pytrainer_main = pytrainer_main
+ """ Initialize all query parameters to valid default values"""
self.title = ''
self.sport = 0
- self.past = None
- self.duration = None
+ self.past = 0
+ self.duration = 0
+ self.distance = 0
self.listSport = self.pytrainer_main.profile.getSportList()
self.listPast = [['All Time', -99999], ['Last 4 Weeks', -31],
['Last 6 Months', -183], ['Last 12 Months', -366]]
@@ -20,7 +22,16 @@
['<1 Hour', [0,3600]],
['1-2 Hours', [3600,7200]],
['>2 Hours', [7200,999999]]]
-
+
+ #if self.pytrainer_main.profile.prf_us_system == True:
+ self.listDistanceUS = [['All Distances', [0.0,999999.9]],
+ ['<1 mi', [0.0, 1.609344]],
+ ['1-5 mi', [1.609344, 8.04672]],
+ ['5-10 mi', [8.04672, 16.09344]],
+ ['10-20 mi', [16.09344, 32.18688]],
+ ['20-50 mi', [32.18688, 80.4672]],
+ ['>50 mi', [80.4672, 999999.9]]]
+
self.listDistance = [['All Distances', [0.0,999999.9]],
['<1 km', [0.0, 1.0]],
['1-5 km', [1.0, 5.0]],
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2010-10-12 10:30:51 UTC (rev 660)
+++ pytrainer/trunk/pytrainer/main.py 2010-10-12 20:29:55 UTC (rev 661)
@@ -50,7 +50,7 @@
class pyTrainer:
def __init__(self,filename = None, data_path = None):
#Version constants
- self.version ="1.7.2_svn#660"
+ self.version ="1.7.2_svn#661"
self.DB_version = 5
#Process command line options
self.startup_options = self.get_options()
@@ -298,7 +298,8 @@
def refreshListRecords(self):
logging.debug('>>')
#Refresh list view
- self.refreshListView()
+ #self.refreshListView() # old variant
+ self.refreshListView(self.windowmain.listsearch.condition)
#Refresh list records
date = self.date.getDate()
record_list = self.record.getrecordList(date)
@@ -312,25 +313,19 @@
self.athlete.refresh()
self.windowmain.actualize_athleteview(self.athlete)
logging.debug('<<')
-
- def refreshListView(self):
+
+ def refreshListView(self,condition=None):
logging.debug('>>')
- record_list = self.record.getAllRecordList()
+ record_list = self.record.getRecordListByCondition(condition)
self.windowmain.actualize_listview(record_list)
logging.debug('<<')
-
+
def refreshWaypointView(self,default_waypoint=None,redrawmap=1):
logging.debug('>>')
waypoint_list = self.waypoint.getAllWaypoints()
self.windowmain.actualize_waypointview(waypoint_list,default_waypoint,redrawmap)
logging.debug('<<')
- def searchListView(self,condition):
- logging.debug('>>')
- record_list = self.record.getRecordListByCondition(condition)
- self.windowmain.actualize_listview(record_list)
- logging.debug('<<')
-
def editExtensions(self):
logging.debug('>>')
before = self.extension.getActiveExtensions()
Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py 2010-10-12 10:30:51 UTC (rev 660)
+++ pytrainer/trunk/pytrainer/record.py 2010-10-12 20:29:55 UTC (rev 661)
@@ -440,9 +440,12 @@
def getRecordListByCondition(self,condition):
logging.debug('--')
- return self.pytrainer_main.ddbb.select("records,sports",
- "date,distance,average,title,sports.name,id_record,time,beats,calories",
- "sports.id_sports = records.sport and %s" %condition)
+ if condition is None:
+ return self.getAllRecordList()
+ else:
+ return self.pytrainer_main.ddbb.select("records,sports",
+ "date,distance,average,title,sports.name,id_record,time,beats,calories",
+ "sports.id_sports = records.sport and %s" %condition)
def getRecordDayList(self,date):
logging.debug('>>')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
