Give basic functionality to mouse shifts

git-svn-id: file:///svnroot/wifihood/branches/mapview-redesign@183 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/view.py b/view.py
index f4dd385..1beb6c8 100755 (executable)
--- a/view.py
+++ b/view.py
@@ -204,17 +204,17 @@ class AbstractmapWidget :
 class interactiveMapWidget :
 
   def Shift( self , dx , dy ) :
-    self.hide()
 
-    tile_x , tile_y = ( self.refpix_x - dx ) / self.tile_size , ( self.refpix_y - dy ) / self.tile_size
-    self.reftile_x += tile_x
-    self.reftile_y += tile_y
+#    tile_x , tile_y = ( self.refpix_x - dx ) / self.tile_size , ( self.refpix_y - dy ) / self.tile_size
+#    self.reftile_x += tile_x
+#    self.reftile_y += tile_y
 
-    self.refpix_x -= dx + self.tile_size * tile_x
-    self.refpix_y -= dy + self.tile_size * tile_y
+#    self.refpix_x -= dx + self.tile_size * tile_x
+#    self.refpix_y -= dy + self.tile_size * tile_y
 
-    self.composeMap()
-    self.show()
+        self.mapwidget._bg.vport[0] += dx
+        self.mapwidget._bg.vport[1] += dy
+        self.mapwidget.update_background()
 
   def Up( self ) :
         self.mapwidget.reftile_y -= 1
@@ -368,10 +368,11 @@ class mapWidget ( gtk.EventBox , interactiveMapWidget ) :
         self.connect_object('button_release_event', self.release_event, self)
 
     def press_event ( self , widget , event ) :
-        self.click_x , self.click_y = event.x , event.x
+        self.click_x , self.click_y = event.x , event.y
 
     def release_event ( self , widget, event ) :
-        shift = math.sqrt( (event.x-self.click_x)**2 + (event.y-self.click_y)**2 )
+        delta_x = int( self.click_x - event.x )
+        delta_y = int( self.click_y - event.y )
         widget.Shift(delta_x, delta_y)
         self.click_x , self.click_y = None , None