From 1888a78c5f238de305278aafd7289b0c92247495 Mon Sep 17 00:00:00 2001
From: root <root@overo.(none)>
Date: Fri, 17 Aug 2012 17:45:27 +0100
Subject: logging

---
 domst_grad.png                           | Bin 42973 -> 53923 bytes
 logger.py                                |  12 ++++++++++++
 tomorrowthegroundGUI/data/domst_grad.png | Bin 42973 -> 53923 bytes
 wim.py                                   |  19 ++++++++++++++++---
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 logger.py

diff --git a/domst_grad.png b/domst_grad.png
index 42b6783..c5c5e0f 100644
Binary files a/domst_grad.png and b/domst_grad.png differ
diff --git a/logger.py b/logger.py
new file mode 100644
index 0000000..2ec5bb8
--- /dev/null
+++ b/logger.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+class log():
+	def timestamp(self):
+		return  time.strftime('%a %D %H:%M:%S ')
+	def __init__(self,logname):
+		self.logname=logname
+		self.log("log started")
+	def log(self,entry):
+		f=open(self.logname,"a")
+		f.write(self.timestamp()+entry+'\n')
+		f.close()
\ No newline at end of file
diff --git a/tomorrowthegroundGUI/data/domst_grad.png b/tomorrowthegroundGUI/data/domst_grad.png
index 42b6783..c5c5e0f 100644
Binary files a/tomorrowthegroundGUI/data/domst_grad.png and b/tomorrowthegroundGUI/data/domst_grad.png differ
diff --git a/wim.py b/wim.py
index 29e3ecb..21c7052 100755
--- a/wim.py
+++ b/wim.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #UDP listener
 
-import signal,sys
+import signal,sys,time
 
 def signal_handler(signal, frame):
         insock.close()
@@ -13,20 +13,26 @@ signal.signal(signal.SIGINT, signal_handler)
 from latLng import *
 from layers import *
 from xml2obj import *
+from logger import *
 
 
 if len(sys.argv)<2:
-	print "wim: usage: tomorrowtheground configfile [-D debug][-T test]"
+	print "wim: usage: tomorrowtheground configfile [-D debug] [-L log] [-T test]"
 	sys.exit(0)
 
 Debug=False
 test=False
+log=False
 if len(sys.argv)>2:
 	if sys.argv[2]=="-D" or sys.argv[2]=="-d":
 		Debug=True
 		print "wim: DEBUG mode"
 if len(sys.argv)>3:
-	if sys.argv[3]=="-T" or sys.argv[3]=="-t":
+	if sys.argv[3]=="-L" or sys.argv[3]=="-l":
+		log=True
+		print "wim: gps LOG mode"
+if len(sys.argv)>4:
+	if sys.argv[4]=="-T" or sys.argv[4]=="-t":
 		test=True
 		print "wim: gps TEST mode"
 	
@@ -75,7 +81,12 @@ scan=scanner("127.0.0.1",5401,False)
 for t in doc.bt.trigger:
 	scan.d.dm.triggers[t.id]=(t.command,t.param)
 scan.start()
+		
+logger=None
 
+if log:
+	logger=log("gpslog")
+	logger.log("Starting log")
 
 import socket
 
@@ -120,6 +131,8 @@ while True:
 			posChanged=True
 	if posChanged:
 		posChanged=False
+		if log:
+			logger.log(pos.lng+","+pos.lat)
 		for layer in gpslayers:
 			r=layer.checkcoord(pos) #returns a message or None
 			if r!=None:
-- 
cgit v1.2.3