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

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

Revision: 613
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=613&view=rev
Author:   jblance
Date:     2010-09-21 04:23:13 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
Add GUI option to anonymise GPX data in OSM extension

Modified Paths:
--------------
    pytrainer/trunk/extensions/openstreetmap/openstreetmap.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/extensions/openstreetmap/openstreetmap.py
===================================================================
--- pytrainer/trunk/extensions/openstreetmap/openstreetmap.py	2010-09-20 00:41:08 UTC (rev 612)
+++ pytrainer/trunk/extensions/openstreetmap/openstreetmap.py	2010-09-21 04:23:13 UTC (rev 613)
@@ -56,6 +56,11 @@
 				f.close()
 				logging.debug("User abort")
 				return
+			if self.makeanon:
+				logging.debug("User requested anonymising of GPX data")
+				f.close()					#Close standard gpxfile
+				gpx_file = self.make_gpx_private(gpx_file)
+				f = open(gpx_file, 'r') 	#Open anonymous gpxfile in readonly mode
 			fields = (("description",self.description), ("tags",self.tags), ("visibility",self.visibility))
 			logging.debug("Added fields: %s" % str(fields))
 			#Multipart encode the request
@@ -131,6 +136,13 @@
 		table.attach(combobox,1,2,2,3)
 		self.entryList.append(combobox)
 		table.attach(label,0,1,2,3)
+		#Add anonymize GPX option
+		label = gtk.Label("<b>Anonymize GPX Data</b>")
+		label.set_use_markup(True)
+		table.attach(label,0,1,3,4)
+		checkbutton = gtk.CheckButton()
+		table.attach(checkbutton,1,2,3,4)
+		self.entryList.append(checkbutton)
 		#Buld dialog and show
 		self.prefwindow.vbox.pack_start(table)
 		self.prefwindow.show_all()
@@ -148,7 +160,8 @@
 			self.description = "Uploaded from pytrainer"
 		self.tags = self.entryList[1].get_text()
 		self.visibility = self.entryList[2].get_active_text()
-		logging.debug("Description: %s, tags: %s, visibility: %s" % ( self.description, self.tags, self.visibility) )
+		self.makeanon = self.entryList[3].get_active()
+		logging.debug("Description: %s, tags: %s, visibility: %s, makeanon: %s" % ( self.description, self.tags, self.visibility, self.makeanon) )
 
 	def multipart_encode(self, fields, files, boundary = None, buffer = None):
 		'''
@@ -182,7 +195,7 @@
 		wipes out private data from gpx files
 		converts laps to waypoints
 		'''
-		
+		logging.debug(">>")
 		if gpx_file is None:
 			return None
 		
@@ -270,6 +283,7 @@
 		#xmlschema.validate(tree)
 
 		# write new gpx file
-		write(anon_gpx_file, pretty_print=False, xml_declaration=True, encoding='UTF-8')
+		tree.write(anon_gpx_file, pretty_print=False, xml_declaration=True, encoding='UTF-8')
+		logging.debug("<<")
 		return anon_gpx_file
 

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-09-20 00:41:08 UTC (rev 612)
+++ pytrainer/trunk/pytrainer/main.py	2010-09-21 04:23:13 UTC (rev 613)
@@ -49,7 +49,7 @@
 class pyTrainer:
 	def __init__(self,filename = None, data_path = None):
 		#Version constants
-		self.version ="1.7.2_svn#612"
+		self.version ="1.7.2_svn#613"
 		self.DB_version = 3
 		#Process command line options
 		self.startup_options = self.get_options()


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