REFACTORING : implement setter methods for coordinates and zoom to make easier the...

[wifihood] / wifiscanner / wifimap / scanner.py

diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py
index 41f2e5c..bddd462 100644 (file)
--- a/wifiscanner/wifimap/scanner.py
+++ b/wifiscanner/wifimap/scanner.py
@@ -13,14 +13,14 @@ import gobject
 
 import os
 
-conf = config.Configuration()
-
 class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
 
     def __init__ ( self , ifname="wlan0" ) :
         gps.GPSObject.__init__( self )
         wifiscan.WifiScanner.__init__( self , ifname )
-        self.db = db.database( os.path.join( conf.homedir , conf.dbname ) )
+        conf = config.Configuration( 'scanner' )
+        self.homedir = conf.homedir
+        self.db = db.database( os.path.join( self.homedir , conf.dbname ) )
 
         # Values to be set by wireless scans
         self.newap = 0
@@ -49,15 +49,15 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
         self.write_logs()
 
     def write_logs ( self ) :
-            fd = open( os.path.join( conf.homedir , "wiscan_gui.info" ) , 'a' )
+            fd = open( os.path.join( self.homedir , "wiscan_gui.info" ) , 'a' )
             fd.write( "%s %s %s\n" % ( self.tstamp , self.info , self.scanlist ) )
             fd.close()
             if self.satellites :
-                loclist = open( os.path.join( conf.homedir , "location.info" ) , 'a' )
+                loclist = open( os.path.join( self.homedir , "location.info" ) , 'a' )
                 loclist.write ( "%s\n" % ( self.satellites ,) )
                 loclist.close()
             if self.cells :
-                celllist = open( os.path.join( conf.homedir , "cell.info" ) , 'a' )
+                celllist = open( os.path.join( self.homedir , "cell.info" ) , 'a' )
                 celllist.write ( "%s\n" % ( self.cells ,) )
                 celllist.close()