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

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

Revision: 537
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=537&view=rev
Author:   jblance
Date:     2010-03-16 08:32:00 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Unified import - bug fix for edited comments

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

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2010-03-15 09:18:47 UTC (rev 536)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2010-03-16 08:32:00 UTC (rev 537)
@@ -122,7 +122,7 @@
 		self.recordbuttons_hbox.show_all()
 
 	def runExtension(self,widget,widget2,extension):
-		print extension
+		#print extension
 		txtbutton,extensioncode,extensiontype = extension
 		id = None
 		if extensiontype=="record":

Modified: pytrainer/trunk/pytrainer/gui/windowrecord.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowrecord.py	2010-03-15 09:18:47 UTC (rev 536)
+++ pytrainer/trunk/pytrainer/gui/windowrecord.py	2010-03-16 08:32:00 UTC (rev 537)
@@ -364,14 +364,14 @@
 		#set duration
 		time = Date().time2second(self.activity_data[row]["rcd_time"])		#TODO Fix to use timeinseconds!!
 		self.setTime(time) 													#TODO Fix to use timeinseconds!!
-		#self.rcd_hour.set_value(self.activity_data[row]["rcd_hour"])
-		#self.rcd_min.set_value(self.activity_data[row]["rcd_min"])
-		#self.rcd_second.set_value(self.activity_data[row]["rcd_second"])
 		#Set distance
 		self.setValue("rcd_distance",self.activity_data[row]["rcd_distance"], "%s")
-		#set start date
-		#start_date = start
-		#self.setValue("rcd_date", start, "%s")
+		#Set comments
+		buffer = self.rcd_comments.get_buffer()
+		start,end = buffer.get_bounds()
+		if "rcd_comments" not in self.activity_data[row]:
+			self.activity_data[row]["rcd_comments"] = ""
+		buffer.set_text(self.activity_data[row]["rcd_comments"])
 		while gtk.events_pending():	# This allows the GUI to update 
 			gtk.main_iteration()	# before completion of this entire action
 		if self.activity_data[row]["complete"] is False:
@@ -396,16 +396,17 @@
 		self.setValue("rcd_date", self.activity_data[row]["rcd_date"], "%s")
 		self.setValue("rcd_starttime", self.activity_data[row]["rcd_starttime"], "%s")
 		self.setValue("rcd_average",self.activity_data[row]["rcd_average"])
-		self.setValue("rcd_calories",self.activity_data[row]["rcd_calories"], "%0.0f")
-		self.setValue("rcd_beats",self.activity_data[row]["rcd_beats"], "%0.0f")
-		self.setValue("rcd_upositive",self.activity_data[row]["rcd_upositive"])
-		self.setValue("rcd_unegative",self.activity_data[row]["rcd_unegative"])
+		self.setValue("rcd_calories",self.activity_data[row]["rcd_calories"], "%s")
+		self.setValue("rcd_beats",self.activity_data[row]["rcd_beats"], "%s")
+		self.setValue("rcd_upositive",self.activity_data[row]["rcd_upositive"], "%s")
+		self.setValue("rcd_unegative",self.activity_data[row]["rcd_unegative"], "%s")
 		self.setValue("rcd_maxvel",self.activity_data[row]["rcd_maxvel"])
 		self.rcd_maxpace.set_text(self.activity_data[row]["rcd_maxpace"])
 		self.rcd_pace.set_text(self.activity_data[row]["rcd_pace"])
-		self.setValue("rcd_maxbeats",self.activity_data[row]["rcd_maxbeats"], "%0.0f")
+		self.setValue("rcd_maxbeats",self.activity_data[row]["rcd_maxbeats"], "%s")
 		self.rcd_title.set_text(self.activity_data[row]["rcd_title"])
 		
+		
 	def on_rcd_title_changed(self, widget):
 		if self.mode == "multiple_activities" and self.active_row is not None:
 			self.activity_data[self.active_row]["rcd_title"] = self.rcd_title.get_text()

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-03-15 09:18:47 UTC (rev 536)
+++ pytrainer/trunk/pytrainer/main.py	2010-03-16 08:32:00 UTC (rev 537)
@@ -63,7 +63,7 @@
 class pyTrainer:
 	def __init__(self,filename = None, data_path = None): 
 		#Version constants
-		self.version ="1.7.1_svn#536"
+		self.version ="1.7.1_svn#537"
 		self.DB_version = 3
 		
 		#Setup usage and permitted options


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