Plot close APs taken from database

[wifihood] / wifiscanner / wifiscanner.py

diff --git a/wifiscanner/wifiscanner.py b/wifiscanner/wifiscanner.py
index 29ac58f..2370750 100755 (executable)
--- a/wifiscanner/wifiscanner.py
+++ b/wifiscanner/wifiscanner.py
@@ -78,8 +78,12 @@ class AbstractWifiscanner :
         bottom_frame.add( bottom_box )
 
         # Top frame population
+        notebook = gtk.Notebook()
+        hbox.pack_start( notebook )
+
         scrollview = gtk.ScrolledWindow()
-        hbox.pack_start( scrollview )
+        notebook.append_page( scrollview , gtk.Label("Scanning") )
+        notebook.append_page( MapWindow() , gtk.Label("Map") )
 
         buttons = gtk.VBox(homogeneous=False, spacing=0)
         hbox.pack_end(buttons, expand=False)
@@ -113,6 +117,17 @@ class AbstractWifiscanner :
 
 if hildon :
 
+    class MapWindow ( gtk.Frame ) :
+
+        def __init__(self):
+            gtk.Frame.__init__( self )
+
+            self.config = wifimap.config.Configuration()
+            self.config.zoom = 16
+            self.map = wifiview.mapWidget( self.config )
+            self.map.plot_APs()
+            self.add( self.map )
+
     class Wifiscanner ( AbstractWifiscanner , hildon.Window ) :
 
         def __init__ ( self ) :
@@ -144,12 +159,14 @@ if hildon :
 
 else :
 
-    class MapWindow ( wifiview.AbstractMapWindow , gtk.Frame ) :
+    class MapWindow ( gtk.Frame ) :
 
         def __init__(self):
             gtk.Frame.__init__( self )
-            wifiview.AbstractMapWindow.__init__(self)
-            self.add( self.vbox )
+
+            self.config = wifimap.config.Configuration()
+            self.config.zoom = 16
+            self.add( wifiview.mapWidget( self.config , (640,400) ) )
 
     class Wifiscanner ( AbstractWifiscanner , gtk.Window ) :
 
@@ -157,12 +174,8 @@ else :
             gtk.Window.__init__( self )
             self.resize(640,400)
 
-            notebook = gtk.Notebook()
-            self.add( notebook )
-
             AbstractWifiscanner.__init__( self )
-            notebook.append_page( self.vbox , gtk.Label("Scanning") )
-            notebook.append_page( MapWindow() , gtk.Label("Map") )
+            self.add(self.vbox)
 
         def TextView ( self , placeholder=None ) :
             textview = gtk.TextView()