REFACTORING : move tstamp into real scanner object

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

diff --git a/wifiscanner/wifimap/replay.py b/wifiscanner/wifimap/replay.py
index 0d2c712..a0ccd46 100644 (file)
--- a/wifiscanner/wifimap/replay.py
+++ b/wifiscanner/wifimap/replay.py
@@ -26,11 +26,11 @@ class ReplayScanner ( gobject.GObject ) :
 
         # Values to be set by wireless scans
         self.scanlist = {}
-        self.tstamp = 0
         self.nscan = 0
         self.nfp = 0
 
         # Values from the Scanner object
+        self.tstamp = 0
         self.newap = 0
         self.newaps = False
         self.aps = {}

diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py
index 0f3ce51..5d4e21a 100644 (file)
--- a/wifiscanner/wifimap/scanner.py
+++ b/wifiscanner/wifimap/scanner.py
@@ -24,6 +24,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
         self.write = False
 
         # Values to be set by wireless scans
+        self.tstamp = 0
         self.newap = 0
         self.newaps = False
         self.aps = {}
@@ -42,6 +43,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
         self.write = False
 
     def scan ( self ) :
+        self.tstamp = time.time()
         wifiscan.WifiScanner.scan( self )
         newap = 0
         self.newaps = False

diff --git a/wifiscanner/wifimap/wifiscan.py b/wifiscanner/wifimap/wifiscan.py
index 934e4ab..f2a59ba 100644 (file)
--- a/wifiscanner/wifimap/wifiscan.py
+++ b/wifiscanner/wifimap/wifiscan.py
@@ -21,7 +21,6 @@ class WifiScanner ( gobject.GObject ) :
 
         # Values to be set by wireless scans
         self.scanlist = {}
-        self.tstamp = 0
         self.nscan = 0
         self.nfp = 0
 
@@ -44,7 +43,6 @@ class WifiScanner ( gobject.GObject ) :
             # BUG : if scan is called after stop (maybe in other cases), 'ERROR' is returned and split raises exception
             self.nscan +=1
             self.scanlist.clear()
-            self.tstamp = time.time()
             for net in scan_out.split() :
                 self.nfp += 1
                 items = net.rsplit(":", 1)
@@ -69,7 +67,6 @@ if __name__ == "__main__" :
     def show_scan(sample):
         gobject.timeout_add( 5000 , show_scan , sample )
         print "scan results : %s" % sample.report()
-        print "  tstamp %s" % sample.tstamp
         c = 0
         for k,v in sample.scanlist.iteritems() :
            c += 1