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

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

Revision: 409
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=409&view=rev
Author:   jblance
Date:     2009-11-29 00:19:32 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
Modified on_sportlist_changed event to improve performance

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/gui/windowmain.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2009-11-26 09:48:08 UTC (rev 408)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2009-11-29 00:19:32 UTC (rev 409)
@@ -46,6 +46,7 @@
 
 		self.popup = PopupMenu(data_path,self)
 		self.block = False
+		self.activeSport = None
 
 	def new(self):
 		self.menublocking = 0
@@ -122,15 +123,19 @@
 	def createMap(self,Googlemaps,waypoint):
 		self.googlemaps = Googlemaps(self.data_path, self.map_vbox,waypoint)
 
-	def updateSportList(self,listSport):
+	def updateSportList(self,listSport): 
 		logging.debug(">>")
-		self.sportlist.set_active(1)
-		while (self.sportlist.get_active() == 1):
-			self.sportlist.remove_text(1)
-			self.sportlist.set_active(1)
+		liststore =  self.sportlist.get_model()
+		if self.sportlist.get_active() is not 0:
+			self.sportlist.set_active(0) #Set first item active if it isnt
+		firstEntry = self.sportlist.get_active_text()
+		liststore.clear() #Delete all items
+		#Re-add "All Sports"
+		liststore.append([firstEntry])
+		#Re-add all sports in listSport
 		for i in listSport:
-			self.sportlist.append_text(i[0])
-			self.sportlist.set_active(0)
+			liststore.append([i[0]])
+		self.sportlist.set_active(0)
 		logging.debug("<<")
 
 	def create_treeview(self,treeview,column_names):
@@ -769,7 +774,11 @@
 	
 	def on_sportlist_changed(self,widget):
 		logging.debug("--")
-		self.parent.refreshGraphView(self.selected_view)
+		if self.sportlist.get_active() != self.activeSport:
+			self.activeSport = self.sportlist.get_active()
+			self.parent.refreshGraphView(self.selected_view)
+		else:
+			logging.debug("on_sportlist_changed called with no change")
 	
 	def on_page_change(self,widget,gpointer,page):
 		logging.debug("--")

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-11-26 09:48:08 UTC (rev 408)
+++ pytrainer/trunk/pytrainer/main.py	2009-11-29 00:19:32 UTC (rev 409)
@@ -93,7 +93,7 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.6.0.9_svn#408"
+		self.version ="1.6.0.9_svn#409"
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?


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