Use points of different size to signal that some new AP was found

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

diff --git a/wifiscanner/wifimap/replay.py b/wifiscanner/wifimap/replay.py
index c581a18..2eee9c4 100644 (file)
--- a/wifiscanner/wifimap/replay.py
+++ b/wifiscanner/wifimap/replay.py
@@ -34,6 +34,7 @@ class ReplayScanner ( gobject.GObject ) :
 
         # Values from the Scanner object
         self.newap = 0
+        self.newaps = False
 
     def start ( self , timeout=5000 ) :
         self.scan_timeout = timeout
@@ -69,6 +70,8 @@ class ReplayScanner ( gobject.GObject ) :
             self.nfp += 1
             self.scanlist[ self._current[n] ] = int(self._current[n+1])
 
+        newap = 0
+        self.newaps = False
         for mac,max_rss in self.scanlist.iteritems() :
             stored = self.db.get( mac )
             if stored :
@@ -76,13 +79,16 @@ class ReplayScanner ( gobject.GObject ) :
                     max_rss = stored[0]
                 self.db.update( mac , max_rss , self.tstamp , self.info[4:] )
             else :
-                self.newap += 1
+                newap += 1
                 self.db.add( mac , max_rss , self.tstamp , self.info[4:] )
+        if newap :
+            self.newap += newap
+            self.newaps = True
 
         self._current = next
 
     def report ( self ) :
-        return "%d gps\t%d scan\t%d fp\t%d ap\t%d total ap" % ( self.ngps , self.nscan , self.nfp , self.newap , -1 )
+        return "%d gps\t%d scan\t%d fp\t%d ap\t%d total ap" % ( self.ngps , self.nscan , self.nfp , self.newap , self.db.nrows() )
 
 
 gobject.type_register(ReplayScanner)

diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py
index 4470121..0a71c61 100644 (file)
--- a/wifiscanner/wifimap/scanner.py
+++ b/wifiscanner/wifimap/scanner.py
@@ -24,6 +24,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
 
         # Values to be set by wireless scans
         self.newap = 0
+        self.newaps = False
 
     def start ( self , timeout=5000 ) :
         gps.GPSObject.start( self )
@@ -37,6 +38,8 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
 
     def scan ( self ) :
         wifiscan.WifiScanner.scan( self )
+        newap = 0
+        self.newaps = False
         for mac,max_rss in self.scanlist.iteritems() :
             stored = self.db.get( mac )
             if stored :
@@ -44,8 +47,11 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
                     max_rss = stored[0]
                 self.db.update( mac , max_rss , self.tstamp , self.info[4:] )
             else :
-                self.newap += 1
+                newap += 1
                 self.db.add( mac , max_rss , self.tstamp , self.info[4:] )
+        if newap :
+            self.newap += newap
+            self.newaps = True
         self.write_logs()
 
     def write_logs ( self ) :

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
index 424c3f4..df243d3 100755 (executable)
--- a/wifiscanner/wifiscanner
+++ b/wifiscanner/wifiscanner
@@ -59,7 +59,10 @@ class scanner ( wifimap.ReplayScanner ) :
             self.map.hide()
             self.map.recenter( self.info[4:6] )
             pixmap,mask = self.map.get_pixbuf().render_pixmap_and_mask()
-            self.map.plot( pixmap , ( float(self.info[4]) , float(self.info[5]) ) , "red" , 2 )
+            pointsize = 2
+            if self.newaps :
+                pointsize += 2
+            self.map.plot( pixmap , ( float(self.info[4]) , float(self.info[5]) ) , "red" , pointsize )
             self.map.get_pixbuf().get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.map.win_x, self.map.win_y )
             self.map.show()