Store scan period in seconds

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

diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py
index ec8ff1e..99eeeab 100644 (file)
--- a/wifiscanner/wifimap/config.py
+++ b/wifiscanner/wifimap/config.py
@@ -21,7 +21,7 @@ class Configuration :
         self.mapsdir = client.get_string( "/apps/wifihood/maps" ) or "/home/user/MyDocs/.maps"
         self.mapclass = client.get_string( "/apps/wifihood/maptype" ) or "OpenStreetMap I"
 
-        self.scan_period = client.get_int( "/apps/wifihood/scan-period" ) or 5000
+        self.scan_period = client.get_float( "/apps/wifihood/scan-period" ) or 5
 
         self.store_log = client.get_bool( "/apps/wifihood/store-logfile" )
 
@@ -66,7 +66,7 @@ class Configuration :
         client.set_string( "/apps/wifihood/basedir" , self.homedir )
         client.set_string( "/apps/wifihood/dbname" , self.dbname )
 
-        client.set_int( "/apps/wifihood/scan-period" , self.scan_period )
+        client.set_float( "/apps/wifihood/scan-period" , self.scan_period )
         client.set_bool( "/apps/wifihood/store-logfile" , self.store_log )
         client.set_bool( "/apps/wifihood/use-mapper" , self.use_mapper )
         client.set_bool( "/apps/wifihood/store-gps" , self.store_gps )
@@ -175,8 +175,8 @@ class AbstractSettingsWindow :
         datatable.attach(scanlabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL)
 
         scanvalue = self.Entry()
-        scanvalue.connect( "changed" , self.int_cb , config , "scan-period" , 1000 )
-        scanvalue.set_text( "%s" % ( float(config.scan_period) / 1000 ) )
+        scanvalue.connect( "changed" , self.float_cb , config , "scan-period" )
+        scanvalue.set_text( "%s" % config.scan_period )
         scanvalue.show()
         datatable.attach(scanvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL)
 
@@ -192,6 +192,9 @@ class AbstractSettingsWindow :
     def entry_cb ( self , entry , config , keyword ) :
         config.__dict__[ keyword ] = entry.get_text()
 
+    def float_cb ( self , entry , config , keyword ) :
+        config.__dict__[ keyword ] = float( entry.get_text() )
+
     def int_cb ( self , entry , config , keyword , scale=1 ) :
         config.__dict__[ keyword ] = int( scale * float( entry.get_text() ) )
 

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
index ed0adc2..9bd86fb 100755 (executable)
--- a/wifiscanner/wifiscanner
+++ b/wifiscanner/wifiscanner
@@ -9,7 +9,7 @@ except :
     hildon = False
 
 def global_start(button, scanner, config):
-    scanner.start( config.scan_period , config.store_log )
+    scanner.start( int( 1000 * config.scan_period ) , config.store_log )
     if button._id :
         button.disconnect( button._id )
     button._id = button.connect("clicked", global_stop, scanner, config)