From 081eff3ad5caf531e89ec1aa455211ac655fae15 Mon Sep 17 00:00:00 2001 From: javiplx Date: Fri, 13 May 2011 20:53:04 +0000 Subject: [PATCH] Fixed replay scanner and logfile write git-svn-id: file:///svnroot/wifihood/trunk@155 c51dfc6a-5949-4919-9c8e-f207a149c383 --- wifiscanner/wifimap/replay.py | 4 +++- wifiscanner/wifimap/scanner.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wifiscanner/wifimap/replay.py b/wifiscanner/wifimap/replay.py index 6d1fdc9..c581a18 100644 --- a/wifiscanner/wifimap/replay.py +++ b/wifiscanner/wifimap/replay.py @@ -52,6 +52,8 @@ class ReplayScanner ( gobject.GObject ) : return next = self._fd.readline().split() + if not next : + return delta = float(next[0]) - float(self._current[0]) gobject.timeout_add( int(1000 / self._speed * delta) , self.scan ) @@ -63,7 +65,7 @@ class ReplayScanner ( gobject.GObject ) : self.nscan +=1 self.scanlist.clear() self.tstamp = float(self._current[0]) - for n in range(11, len(self._current), 2) : + for n in range(10, len(self._current), 2) : self.nfp += 1 self.scanlist[ self._current[n] ] = int(self._current[n+1]) diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py index bddd462..4470121 100644 --- a/wifiscanner/wifimap/scanner.py +++ b/wifiscanner/wifimap/scanner.py @@ -50,7 +50,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) : def write_logs ( self ) : fd = open( os.path.join( self.homedir , "wiscan_gui.info" ) , 'a' ) - fd.write( "%s %s %s\n" % ( self.tstamp , self.info , self.scanlist ) ) + fd.write( "%s %s %s\n" % ( self.tstamp , " ".join(self.info) , " ".join(self.scanlist) ) ) fd.close() if self.satellites : loclist = open( os.path.join( self.homedir , "location.info" ) , 'a' ) -- 1.7.9.5