From 0edcc293804000ab639e9721be6e0f2fa0e436a2 Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Tue, 19 Oct 2010 10:05:33 -0700
Subject: [PATCH] KML at least works some. Need to pass DB filename into KML
 constructor.

---
 src/python/altitude.pyc    | Bin 1420 -> 1420 bytes
 src/python/modes_parse.pyc | Bin 5420 -> 5420 bytes
 src/python/modes_sql.py    |   3 +--
 src/python/uhd_modes.py    |  15 +++++++--------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/python/altitude.pyc b/src/python/altitude.pyc
index 9bfe393cc159d499f41d0fa907c8fbb602b46980..3fd5f572de070c0e2f15af7e1b6a54a5e4204583 100644
GIT binary patch
delta 41
vcmeC-?%`&?_=%T`vv$u$_W#U`vYXji*cchZC-boubIUR?FcdQZ2~H~j_o@j%

delta 41
vcmeC-?%`&?_=%URnt#eh_W#U`?3>wH*ccfdC-boubF(urFcdQZ2~H~j?{Em(

diff --git a/src/python/modes_parse.pyc b/src/python/modes_parse.pyc
index fd8a40e3de2517c2094ab7913ef987651263f02f..a090729bd746ebba6f9ffbb8fe42d6abf45197a2 100644
GIT binary patch
delta 109
zcmZ3ZwML8m;wN4%&e}a2**`Hc%5DC|q|3;tGg*V>H>2fb71lqDPMa0koEaHwH>a{^
zGctB;zQ`fV#5iyBd#+`SjO#Z~;}K<M+_!lR|9ob~JCl8c|1io<_7u4wEY85dP|O7+
NR2an=1%Qx;2>`q=ABg|}

delta 109
zcmZ3ZwML8m;wN6N{H?n;vVUS?<k<X+NtcmPY_bN+Z${<GDy)APbv7%qIWsb*Z%$>;
zW@Iede33(ziLqnzd#+`Sj59Y+;}K<MT(Nl#|9ob~W0QS^|1h#o_7u4w%*epNP|O7+
NR2an=1%Qx;2>`%7A07Yz

diff --git a/src/python/modes_sql.py b/src/python/modes_sql.py
index 36ff59d..5687752 100644
--- a/src/python/modes_sql.py
+++ b/src/python/modes_sql.py
@@ -19,7 +19,6 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-#!/usr/bin/env python
 import time, os, sys
 from string import split, join
 import modes_parse
@@ -28,7 +27,7 @@ import sqlite3
 class modes_output_sql(modes_parse.modes_parse):
   def __init__(self):
     #create the database
-    self.db = sqlite3.connect(':memory:') #RAM-based database, no persistence
+    self.db = sqlite3.connect('wat.db') #RAM-based database, no persistence
     #now execute a schema to create the tables you need
     c = self.db.cursor()
     query = """CREATE TABLE "positions" (
diff --git a/src/python/uhd_modes.py b/src/python/uhd_modes.py
index 3b4c9b0..0c42bed 100755
--- a/src/python/uhd_modes.py
+++ b/src/python/uhd_modes.py
@@ -1,4 +1,4 @@
-#
+#!/usr/bin/env python
 # Copyright 2010 Nick Foster
 # 
 # This file is part of gr-air-modes
@@ -19,8 +19,6 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-
-#!/usr/bin/env python
 from gnuradio import gr, gru, optfir, eng_notation, blks2, air
 from gnuradio import uhd
 from gnuradio.eng_option import eng_option
@@ -31,6 +29,7 @@ from usrpm import usrp_dbid
 from modes_print import modes_output_print
 from modes_sql import modes_output_sql
 from modes_sbs1 import modes_output_sbs1
+from modes_kml import modes_kml
 import gnuradio.gr.gr_threading as _threading
 
 class top_block_runner(_threading.Thread):
@@ -136,11 +135,11 @@ if __name__ == '__main__':
   updates = [] #registry of plugin update functions
 
   if options.kml is not None:
-    sqlport = modes_output_sql()
+    sqlport = modes_output_sql() #create a SQL parser to push stuff into SQLite
     outputs.append(sqlport.insert)
     #also we spawn a thread to run every 30 seconds (or whatever) to generate KML
-    kmlgen = modes_kml(sqlport.db, options.kml) #this is a thread
-    
+    kmlgen = modes_kml(sqlport.db, options.kml) #create a KML generating thread which reads the database
+
   if options.sbs1 is True:
     sbs1port = modes_output_sbs1()
     outputs.append(sbs1port.output)
@@ -176,6 +175,6 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
       fg.stop()
       runner = None
-      if kmlgen is not None: #this breaks your nice output registry scheme
-          kmlgen = None
+      if options.kml is not None:
+          kmlgen.done = True
       break