Implement ap list window

git-svn-id: file:///svnroot/wifihood/trunk/wifiscanner@28 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifimap/gps.py b/wifimap/gps.py
index 3c583fb..03743cd 100644 (file)
--- a/wifimap/gps.py
+++ b/wifimap/gps.py
@@ -99,7 +99,8 @@ class GPSObject ( gobject.GObject ) :
         self.status = statuswin
 
     def refresh_infowin ( self ) :
-        self.status.set_label( "%d gps" % self.ngps )
+        if self.status :
+            self.status.set_label( "%d gps" % self.ngps )
 
 
 #    mode = device.fix[0]

diff --git a/wifimap/wifiscan.py b/wifimap/wifiscan.py
index b278d4c..ed7f7cf 100644 (file)
--- a/wifimap/wifiscan.py
+++ b/wifimap/wifiscan.py
@@ -17,6 +17,7 @@ class Scanner ( gps.GPSObject ) :
         self._timer = None
         self.nscan = 0
         self.nfp = 0
+        self.scanlist = None
         self.aplist = {}
 
     def start ( self ) :
@@ -36,10 +37,15 @@ class Scanner ( gps.GPSObject ) :
             osso.SystemNote(self.osso_context).system_note_infoprint("Exception scanning %s" % ex )
             return True
         out_str = ""
+        if self.scanlist :
+            start, end = self.scanlist.get_bounds()
+            self.scanlist.delete( start , end )
         for net in scan_out.split() :
             self.nfp += 1
             items = net.rsplit(":", 1)
             out_str += " %s %s" % ( items[0] , items[1] )
+            if self.scanlist :
+                self.scanlist.insert_at_cursor( "%s %5d\n" % ( items[0] , int(items[1]) ) )
             self.aplist[ items[0] ] = 1
         self.refresh_infowin()
         if self._debug :
@@ -61,8 +67,13 @@ class Scanner ( gps.GPSObject ) :
 
         return True
 
+    def set_infowin ( self , statuswin , listwin ) :
+        gps.GPSObject.set_infowin( self , statuswin )
+        self.scanlist = listwin
+
     def refresh_infowin ( self ) :
-        self.status.set_label( "%d gps\t%d scan\t%d fp\t%d ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) ) )
+        if self.status :
+            self.status.set_label( "%d gps\t%d scan\t%d fp\t%d ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) ) )
 
 
 gobject.type_register(Scanner)

diff --git a/wifiscanner b/wifiscanner
index af54198..2a74a65 100755 (executable)
--- a/wifiscanner
+++ b/wifiscanner
@@ -2,7 +2,7 @@
 
 import wifimap
 
-import gtk
+import gtk , pango
 import hildon
 
 import gobject
@@ -67,6 +67,9 @@ def main():
     top_frame.add(hbox)
 
     textview = gtk.TextView()
+    textview.set_editable( False )
+    textview.set_cursor_visible( False )
+    textview.modify_font( pango.FontDescription("Courier 12") )
  
     scrollview = gtk.ScrolledWindow()
     scrollview.set_policy( gtk.POLICY_NEVER , gtk.POLICY_AUTOMATIC )
@@ -89,7 +92,7 @@ def main():
     buttons.pack_start(toggle_button, expand=False)
 
     status = gtk.Label( "status bar ..." )
-    gpsdev.set_infowin( status )
+    gpsdev.set_infowin( status , textview.get_buffer() )
     bottom_box.pack_start( status , expand=False , padding=20 )
 
     bottom_frame.add( bottom_box )