REFACTORING : reorganize code to relegate the method to set the label of the zoom...

[wifihood] / wifiview

diff --git a/wifiview b/wifiview
index b534841..407f7e5 100755 (executable)
--- a/wifiview
+++ b/wifiview
@@ -1,8 +1,128 @@
 #!/usr/bin/python
 
-import wifiview
+import gtk
+try :
+    import hildon
+except :
+    hildon = False
 
-if __name__ == "__main__":
-    map = wifiview.MapWindow()
-    map.main()
+import math
+
+import wifimap.config
+
+import wifimap.view
+
+
+class AbstractMapWindow:
+
+    def destroy(self, widget, data=None):
+        gtk.main_quit()
+
+    def press_event ( self, widget, event, *args ) :
+      border_x , border_y = 40 , 30
+      if event.x > border_x and event.y > border_y and event.x < ( self.size_x - border_x ) and event.y < ( self.size_y - border_y ) :
+        self.click_x = event.x
+        self.click_y = event.y
+
+    def release_event ( self, widget, event, *args ) :
+      min_shift = 50
+      if self.click_x is not None and self.click_y is not None :
+        delta_x = int( event.x - self.click_x )
+        delta_y = int( event.y - self.click_y )
+        shift = math.sqrt( delta_x * delta_x + delta_y * delta_y )
+        if shift > min_shift :
+          self.map.Shift(delta_x, delta_y)
+      self.click_x , self.click_y = None , None
+
+    def on_key_press ( self, widget, event, *args ) :
+      if event.keyval == gtk.keysyms.Up :
+          self.map.Up()
+      elif event.keyval == gtk.keysyms.Down :
+          self.map.Down()
+      elif event.keyval == gtk.keysyms.Right :
+          self.map.Right()
+      elif event.keyval == gtk.keysyms.Left :
+          self.map.Left()
+      else :
+          print "UNKNOWN",event.keyval
+
+    def __init__( self , map_size=(800,480) ) :
+
+        self.connect("destroy", self.destroy)
+
+        self.set_border_width(10)
+
+        self.connect("key-press-event", self.on_key_press)
+
+        self.vbox = gtk.VBox(False, 0)
+
+        self.set_events( gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK )
+        self.connect('button_press_event', self.press_event)
+        self.connect('button_release_event', self.release_event)
+
+        self.config = wifimap.config.Configuration()
+        self.map = wifimap.view.mapWidget( self.config , map_size )
+        self.vbox.pack_end( self.map , True , True , 5)
+
+        self.size_x , self.size_y = map_size
+        self.click_x , self.click_y = None , None
+
+    def run(self):
+        gtk.main()
+
+if hildon :
+
+    class MapWindow ( AbstractMapWindow , hildon.Window ) :
+
+        def __init__(self):
+            hildon.Window.__init__( self )
+            AbstractMapWindow.__init__(self)
+            self.add( self.vbox )
+            self.create_menu( self.vbox )
+            self.show_all()
+
+        def create_menu ( self , vbox ) :
+
+            self.menubar = menubar = hildon.AppMenu()
+
+            selector = wifmap.config.ZoomDialog( self.map.conf )
+            zoomlevel = hildon.PickerButton(gtk.HILDON_SIZE_AUTO,
+                                          hildon.BUTTON_ARRANGEMENT_VERTICAL)
+            zoomlevel.set_title( "Zoom" )
+            zoomlevel.set_selector( selector )
+            zoomlevel.connect_object( "value-changed", self.map.ZoomChange , selector )
+            menubar.append( zoomlevel )
+
+            menubar.show_all()
+            self.set_app_menu( menubar )
+
+else :
+
+    class MapWindow ( AbstractMapWindow , gtk.Window ) :
+
+        def __init__(self):
+            gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
+            AbstractMapWindow.__init__(self)
+            self.add( self.vbox )
+            self.create_menu( self.vbox )
+            self.show_all()
+
+            self.resize( self.size_x , self.size_y)
+
+        def create_menu ( self , vbox ) :
+
+            menubar = gtk.MenuBar()
+
+            zoomlevel = gtk.MenuItem( label="Zoom level" )
+            zoomlevel.connect_object( "activate", self.zoomdialog, self.map.conf )
+            menubar.append( zoomlevel )
+
+            vbox.pack_start(menubar,True,True,5)
+
+        def zoomdialog ( self , config ) :
+            dialog = wifimap.config.ZoomDialog( config , self.map.SetZoom )
+            dialog.show_all()
+
+window = MapWindow()
+window.run()