Enable path drawing

diff --git a/view.py b/view.py
index f9ce2fa..7704c8a 100755 (executable)
--- a/view.py
+++ b/view.py
@@ -306,6 +306,7 @@ class simpleMapWidget ( AbstractmapWidget , gtk.Image ) :
         vport = self._bg.get_viewport()
         p = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, self.win_x , self.win_y )
         p.get_from_drawable( self._bg , self._bg.get_colormap() , vport[0] , vport[1] , 0 , 0 , self.win_x , self.win_y )
+        self.draw_paths(p)
         self.set_from_pixbuf(p)
     
     def do_change_refpix ( self , dx , dy ) :
@@ -373,9 +374,6 @@ class simpleMapWidget ( AbstractmapWidget , gtk.Image ) :
                     pixbuf.copy_area( init_x, init_y, size_x, size_y, self.get_pixbuf(), dest_x , dest_y )
                 del(pixbuf)
 
-#        self.draw_paths()
-#        self.plot_APs()
-
     def center( self ) :
 
         center_x , center_y = self.win_x / 2 , self.win_y / 2
@@ -396,11 +394,11 @@ class simpleMapWidget ( AbstractmapWidget , gtk.Image ) :
         dest_x , dest_y = self.gps2pix( coords , ( center_x , center_y ) )
         pixmap.draw_rectangle(gc, True , dest_x , dest_y , radius , radius )
 
-    def draw_paths( self ) :
+    def draw_paths( self , pixbuf ) :
 
-        pixmap,mask = self.get_pixbuf().render_pixmap_and_mask()
+        pixmap,mask = pixbuf.render_pixmap_and_mask()
 
-        filename = "data/wiscan_gui.info.old"
+        filename = "/tmp/wiscan_gui.info"
         fd = open( filename )
         for line in fd.readlines() :
             values = line.split()
@@ -408,11 +406,11 @@ class simpleMapWidget ( AbstractmapWidget , gtk.Image ) :
                 self.plot( pixmap , ( float(values[5]) , float(values[6]) ) , "red" )
         fd.close()
 
-        self.get_pixbuf().get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.win_x, self.win_y )
+        pixbuf.get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.win_x, self.win_y )
 
-    def plot_APs( self ) :
+    def plot_APs( self , pixbuf ) :
 
-        pixmap,mask = self.get_pixbuf().render_pixmap_and_mask()
+        pixmap,mask = pixbuf.render_pixmap_and_mask()
 
         db = wifimap.db.database( os.path.join( self.conf.homedir , self.conf.dbname ) )
         db.open()
@@ -423,7 +421,7 @@ class simpleMapWidget ( AbstractmapWidget , gtk.Image ) :
                 self.plot( pixmap , ( ap[4]/ap[3] , ap[5]/ap[3] ) , "blue" )
         db.close()
 
-        self.get_pixbuf().get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.win_x, self.win_y )
+        pixbuf.get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.win_x, self.win_y )
 
 class mapWidget ( gtk.EventBox ) :
 
@@ -455,7 +453,7 @@ if __name__ == "__main__" :
             self._type = type
 
             self.homedir , self.dbname = None , None
-            self.mapsdir , self.mapclass = "/boot/home/localuser/Maps" , "OpenStreetMap I"
+            self.mapsdir , self.mapclass = os.path.join( os.environ['HOME'] , "MyDocs/.maps" ) , "OpenStreetMap I"
 
             self.store_log , self.use_mapper , self.store_gps = None , None , None