hildon = False
def global_start(button, scanner, config):
- scanner.start( config.scan_period )
+ 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)
if self.newaps :
pointsize += 2
self.map.plot( pixmap , ( float(self.info[4]) , float(self.info[5]) ) , "red" , pointsize )
- while self.aps :
- self.map.plot( pixmap , self.aps.pop() , "green" , 1 )
+ for mac,ap in self.aps.iteritems() :
+ if self.oldpos.get( mac ) :
+ self.map.line( pixmap , self.oldpos[mac] , ( ap[1]/ap[0] , ap[2]/ap[0] ) , "green" )
+ self.map.plot( pixmap , ( ap[1]/ap[0] , ap[2]/ap[0] ) , "green" , 2 )
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()
def __init__ ( self ) :
- _scanner = scanner( "wlan0" )
+ config = wifimap.config.Configuration( 'scanner' )
+ _scanner = scanner( config , "wlan0" )
self.connect("delete_event", gtk.main_quit, None)
scrollview = gtk.ScrolledWindow()
notebook.append_page( scrollview , gtk.Label("Scanning") )
- self.map = MapWindow()
+ self.map = MapWindow( config )
notebook.append_page( self.map , gtk.Label("Map") )
buttons = gtk.VBox(homogeneous=False, spacing=0)
# Buttons creation
button = self.Button( "Switch GPS On")
- button._id = button.connect("clicked", global_start, _scanner, self.map.config)
+ button._id = button.connect("clicked", global_start, _scanner, config)
buttons.pack_start(button, expand=False)
button_scan = self.Button( "Start scanning")
class MapWindow ( gtk.Frame ) :
def __init__(self):
- gtk.Frame.__init__( self )
+ gtk.Frame.__init__( self , config )
- self.config = wifimap.config.Configuration( 'scanner' )
+ self.config = config
self.add( wifimap.simpleMapWidget( self.config ) )
class Wifiscanner ( AbstractWifiscanner , hildon.StackableWindow ) :
class MapWindow ( gtk.Frame ) :
def __init__(self):
- gtk.Frame.__init__( self )
+ gtk.Frame.__init__( self , config )
- self.config = wifimap.config.Configuration( 'scanner' )
+ self.config = config
self.add( wifimap.simpleMapWidget( self.config , (640,400) ) )
class Wifiscanner ( AbstractWifiscanner , gtk.Window ) :