Move interface name selection into main wifiscanner program

[wifihood] / wifiscanner / wifiscanner

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
index be2b7b4..cb2a452 100755 (executable)
--- a/wifiscanner/wifiscanner
+++ b/wifiscanner/wifiscanner
@@ -55,13 +55,19 @@ class scanner ( wifimap.Scanner ) :
         self.buffer.delete( start , end )
         for mac,rss in self.scanlist.iteritems() :
             self.buffer.insert_at_cursor( "%s %5d\n" % ( mac , rss ) )
+        if self.info[0] == "FIX" :
+            self.map.hide()
+            pixmap,mask = self.map.get_pixbuf().render_pixmap_and_mask()
+            self.map.plot( pixmap , ( float(self.info[4]) , float(self.info[5]) ) , "red" , 2 )
+            self.map.get_pixbuf().get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.map.win_x, self.map.win_y )
+            self.map.show()
 
 
 class AbstractWifiscanner :
 
     def __init__ ( self ) :
 
-        _scanner = scanner()
+        _scanner = scanner( "wlan0" )
 
         self.connect("delete_event", gtk.main_quit, None)
 
@@ -113,6 +119,7 @@ class AbstractWifiscanner :
         status = gtk.Label( "status bar ..." )
         _scanner.status = status
         _scanner.buffer = textview.get_buffer() 
+        _scanner.map = notebook.get_nth_page(1).child
         bottom_box.pack_start( status , expand=False , padding=20 )
 
     def run ( self ) :