pytrainer-svn Mailing List for pytrainer (Page 17)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 543
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=543&view=rev
Author:   jblance
Date:     2010-04-04 10:30:47 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
Fixes to waypoint code - no longer duplicates type, selects last added and correctly deals with drag and drop of waypoints

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

Modified: pytrainer/trunk/pytrainer/extensions/waypointeditor.py
===================================================================

--- pytrainer/trunk/pytrainer/extensions/waypointeditor.py	2010-04-03 06:21:07 UTC (rev 542)
+++ pytrainer/trunk/pytrainer/extensions/waypointeditor.py	2010-04-04 10:30:47 UTC (rev 543)
@@ -30,7 +30,7 @@
 import logging
 
 class WaypointEditor:
-	def __init__(self, data_path = None, vbox = None, waypoint=None):		
+	def __init__(self, data_path = None, vbox = None, waypoint=None, parent=None):		
 		logging.debug(">>")
 		self.data_path = data_path
 		self.conf = checkConf()
@@ -41,11 +41,12 @@
 		vbox.show_all()
 		self.htmlfile = ""
 		self.waypoint=waypoint
+		self.pytrainer_main=parent
 		logging.debug("<<")
 		
 	def handle_title_changed(self, *args): 
 		title = self.moz.get_title() 
-		print "Received title", title
+		logging.debug("Received title: "+ title)
 		m = re.match("call:([a-zA-Z]*)[(](.*)[)]", title) 
 		if m: 
 			fname = m.group(1) 
@@ -55,21 +56,26 @@
 				if am: 
 					lon, lat = am.group(1), am.group(2) 
 					lon, lat = float(lon), float(lat) 
-					self.waypoint.addWaypoint(lon, lat, "NEW WAYPOINT") 
+					id_waypoint = self.waypoint.addWaypoint(lon, lat, "NEW WAYPOINT") 
+					self.pytrainer_main.refreshWaypointView(default_waypoint=id_waypoint)
 				else: 
 					raise ValueError("Error parsing addWaypoint parameters: %s" % args) 
 			elif fname == "updateWaypoint": 
 				am = re.match("([+-]?[0-9]+[.][0-9]+),([+-]?[0-9]+[.][0-9]+),([0-9]*)", args) 
 				if am: 
 					lon, lat, id_waypoint = am.group(1), am.group(2), am.group(3) 
-					lon, lat, id_waypoint = float(lon), float(lat), int(id_waypoint) 
+					try:
+						lon, lat, id_waypoint = float(lon), float(lat), int(id_waypoint)
+					except ValueError as e:
+						print "Error parsing addWaypoint parameters: " % args
+						print e
 					retorno = self.waypoint.getwaypointInfo(id_waypoint) 
 					if retorno: 
 						name, comment, sym = retorno[0][5], retorno[0][3], retorno[0][6] 
 						self.waypoint.updateWaypoint(id_waypoint, lat, lon, name, comment, sym) 
+						self.pytrainer_main.refreshWaypointView(default_waypoint=id_waypoint)
 					else: 
 						raise KeyError("Unknown waypoint id %d", id_waypoint) 
-					self.waypoint.addWaypoint(lon, lat, "NEW WAYPOINT") 
 				else: 
 					raise ValueError("Error parsing addWaypoint parameters: %s" % args) 
 			else: 

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2010-04-03 06:21:07 UTC (rev 542)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2010-04-04 10:30:47 UTC (rev 543)
@@ -695,13 +695,28 @@
 			self.waypoint_longitude.set_text(str(record_list[default_id][2]))
 			self.waypoint_name.set_text(str(record_list[default_id][6]))
 			self.waypoint_description.set_text(str(record_list[default_id][4]))
-			self.waypoint_type.insert_text(0,str(record_list[default_id][7]))
-			self.waypoint_type.set_active(0)
+			self.set_waypoint_type(str(record_list[default_id][7]))
 		if redrawmap == 1:
 			self.waypointeditor.createHtml(default_waypoint)
 			self.waypointeditor.drawMap()
 		logging.debug("<<")
 	
+	def set_waypoint_type(self, type):
+		x = 0
+		tree_model = self.waypoint_type.get_model()
+		if tree_model is not None:
+			#iter = tree_model.get_iter_root()
+			for item in tree_model:
+				#if isinstance(item, gtk.TreeModelRow):
+				if item[0] == type:
+					self.waypoint_type.set_active(x)
+					return
+				x += 1
+		self.waypoint_type.insert_text(0, type)
+		self.waypoint_type.set_active(0)
+		return
+			
+	
 	def on_waypointTreeView_button_press(self, treeview, event):
 		x = int(event.x)
 		y = int(event.y)
@@ -791,8 +806,8 @@
 				menuItems[numcolumn-1].set_active(visible)
 		self.menublocking = 1
 	
-	def createWaypointEditor(self,WaypointEditor,waypoint):
-		self.waypointeditor = WaypointEditor(self.data_path, self.waypointvbox,waypoint)
+	def createWaypointEditor(self,WaypointEditor,waypoint, parent=None):
+		self.waypointeditor = WaypointEditor(self.data_path, self.waypointvbox,waypoint,parent)
 
 	######################
 	## Lista de eventos ##

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-04-03 06:21:07 UTC (rev 542)
+++ pytrainer/trunk/pytrainer/main.py	2010-04-04 10:30:47 UTC (rev 543)
@@ -157,7 +157,7 @@
 		self.loadExtensions()
 		self.windowmain.createGraphs(RecordGraph,DayGraph,WeekGraph, MonthGraph,YearGraph,HeartRateGraph)
 		self.windowmain.createMap(Googlemaps,self.waypoint, self.gm3)
-		self.windowmain.createWaypointEditor(WaypointEditor,self.waypoint)
+		self.windowmain.createWaypointEditor(WaypointEditor,self.waypoint, parent=self)
 		self.windowmain.on_calendar_selected(None)
 		self.refreshMainSportList()	 
 		self.windowmain.run()

Modified: pytrainer/trunk/pytrainer/waypoint.py
===================================================================
--- pytrainer/trunk/pytrainer/waypoint.py	2010-04-03 06:21:07 UTC (rev 542)
+++ pytrainer/trunk/pytrainer/waypoint.py	2010-04-04 10:30:47 UTC (rev 543)
@@ -36,6 +36,7 @@
 	def removeWaypoint(self,id_waypoint):
 		logging.debug(">>")
 		self.ddbb.connect()
+		logging.debug("Deleting id_waypoint=%s" %id_waypoint)
 		self.ddbb.delete("waypoints", "id_waypoint=\"%s\"" %id_waypoint)
 		self.ddbb.disconnect()
 		logging.debug("<<")
@@ -43,6 +44,7 @@
 	def updateWaypoint(self,id_waypoint,lat,lon,name,desc,sym):
 		logging.debug(">>")
 		self.ddbb.connect()
+		logging.debug("Updating waypoint id: %d with lat %s,lon %s,comment %s,name %s,sym %s" %(id_waypoint,lat,lon,desc,name,sym) )
 		self.ddbb.update("waypoints","lat,lon,comment,name,sym",[lat,lon,desc,name,sym]," id_waypoint=%d" %id_waypoint)
 		self.ddbb.disconnect()
 		logging.debug("<<")
@@ -52,10 +54,12 @@
 		self.ddbb.connect() 
 		cells = "lat,lon,comment,name,sym" 
 		values = (lat,lon,comment,name,sym) 
+		logging.debug("Adding waypoint with details lat %s,lon %s,comment %s,name %s,sym %s" % (lat,lon,comment,name,sym)  )
 		self.ddbb.insert("waypoints",cells,values) 
 		id_waypoint = self.ddbb.lastRecord("waypoints") 
 		self.ddbb.disconnect() 
 		logging.debug("<<") 
+		return id_waypoint
 
 	def getwaypointInfo(self,id_waypoint):
 		logging.debug(">>")


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




2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2009	Jan	Feb (1)	Mar (15)	Apr (20)	May (2)	Jun (9)	Jul (3)	Aug (2)	Sep (17)	Oct (16)	Nov (38)	Dec (40)
2010	Jan (51)	Feb (11)	Mar (24)	Apr (31)	May (24)	Jun (3)	Jul (9)	Aug (1)	Sep (29)	Oct (33)	Nov (81)	Dec (6)
2011	Jan (2)	Feb (4)	Mar (13)	Apr (4)	May (24)	Jun (4)	Jul (19)	Aug (46)	Sep (10)	Oct (28)	Nov (31)	Dec

pytrainer-svn Mailing List for pytrainer (Page 17)

pytrainer-svn — Mailing list for svn activity