Changeset 53

Timestamp:

25/06/08 08:11:38 (7 months ago)

Author:

gak

Message:

 

Location:

wirelessheatmap/trunk

Files:

• ap.py (added)
• dump2pickle.py (added)
• heat.py (modified) (12 diffs)

wirelessheatmap/trunk/heat.py

@@ -12 +12 @@
 
 from pyglet.window import key
+from pyglet.window import mouse
 from pyglet import window
 from pyglet import image
@@ -17 +18 @@
 from pyglet.gl import *
 
-class AccessPoint(object):
-
-    def __init__(self, *bits):
-        bits = map(lambda a: a.strip(), bits)
-        self.bssid = bits[0]
-        self.first_seen = bits[1]
-        self.last_seen = bits[2]
-        self.channel = int(bits[3])
-        self.speed = int(bits[4])
-        self.privacy = bits[5]
-        self.cipher = bits[6]
-        self.auth = bits[7]
-        self.power = float(bits[8])
-        self.beacons = int(bits[9])
-        self.iv = bits[10]
-        self.ip = bits[11]
-        self.id_length = int(bits[12])
-        self.essid = bits[13]
-        self.key = bits[14]
-
-    def __hash__(self):
-        return hash(self.bssid)
-
-    def __repr__(self):
-        return self.essid
-
+from ap import AccessPoint
 
 class Heat(object):
@@ -51 +27 @@
 
         self.window = window.Window(
-            640, 580,
-            caption='Heat', \
+#            640, 480,
+            1024, 768,
+#            caption='Heat', \
+#            fullscreen=True,
             )
         self.window.on_mouse_press = self.on_mouse_press
+        self.window.on_mouse_drag = self.on_mouse_drag
+        self.window.on_mouse_scroll = self.on_mouse_scroll
         self.window.on_key_release = self.on_key_release
         
         self.current_ap = ''
+       
+        # defaults before image loads
+        self.cellsize = 12
+        self.img_zoom = 1.
 
         if self.cfg.image_file:
             self.img = image.load(self.cfg.image_file)
+            self.img_zoom = float(self.window.width) / self.img.width
+            zoomier = float(self.window.height) / self.img.height
+            if zoomier < self.img_zoom:
+                self.img_zoom = zoomier
+
+            self.cellsize = self.img.width / 100
+
         else:
             self.img = None
 
-        self.img_pos = 0, 0
-        self.img_zoom = 1.
+        self.img_pos = [0., 0.]
 
         self.font_size = 20
@@ -74 +64 @@
         self.last_dump_read = 0
                 
-        self.cellsize = 12
         self.samples = 10
         self.grid = {}
 
+        self.grid_margin = 100  # pixels surrounding the image
+
     def parse_config(self):
         self.cfg = ConfigParser()
-        self.opt = OptionParser( \
-            usage='usage: %prog [options]')
+        self.opt = OptionParser(usage='usage: %prog [options]')
 
         # Configuration loading and saving
@@ -163 +153 @@
             self.window.clear()
             
-            glLoadIdentity()
             if self.current_ap:
                 self.calc_heat()
+
+                self.map_matrix()
                 self.draw_heat()
                 self.draw_strength()
-
+                
+                glLoadIdentity()
                 self.draw_text('%s %s %f' % (self.current_ap,
                     self.ap[self.current_ap].essid, 
@@ -174 +166 @@
 
             if self.img:
+                self.map_matrix()
                 glEnable(GL_BLEND)
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE)
-                glLoadIdentity()
-                glScalef(0.5, 0.5, 1)
-                glColor3f(1, 1, 1)
+                glColor4f(1, 1, 1, 0.5)
                 self.img.blit(0, 0)
                 glDisable(GL_BLEND)
@@ -185 +176 @@
             self.window.dispatch_events()
 #            time.sleep(0.5)
-    
+   
+    def map_matrix(self):
+        glLoadIdentity()
+        glTranslatef(self.img_pos[0], self.img_pos[1], 0)
+        glScalef(self.img_zoom, self.img_zoom, 1)
+
+    def screen2map(self, x, y):
+        x -= self.img_pos[0]
+        y -= self.img_pos[1]
+        x /= self.img_zoom
+        y /= self.img_zoom
+        return x, y
+
     def draw_strength(self):
         if not self.current_ap:
@@ -205 +208 @@
         glBegin(GL_POINTS)
         for pos, strength in self.store[self.current_ap].items():
-            s = (strength - min_str) / (max_str - min_str)
+            s = 0.5 + (strength - min_str) / (max_str - min_str)
             glColor3f(s, s, s)
             glVertex2f(pos[0], pos[1], 0)
@@ -218 +221 @@
         self.grid = {}
         
-        print 'calc'
-        
-        for x in xrange(0, 400, self.cellsize):
-           
-            for y in xrange(0, 800, self.cellsize):
+        gmin = -self.grid_margin
+        gmaxx = self.img.width + self.grid_margin
+        gmaxy = self.img.height + self.grid_margin
+
+        for x in range(gmin, gmaxx, self.cellsize):
+            for y in range(gmin, gmaxy, self.cellsize):
 
                 distance_strengths = []
@@ -241 +245 @@
                 heat /= self.samples
                 self.grid[x, y] = heat
-        print 'calc done'
 
     def draw_heat(self):
@@ -248 +251 @@
         max_heat = max(self.grid.values())
         min_heat = min(self.grid.values())
-
         if not max_heat:
             return
-        if max_heat - min_heat == 0:
+        if max_heat == min_heat:
             return
 
@@ -276 +278 @@
         return colorsys.hsv_to_rgb((1 - val) * 2. / 3, 1, val * 0.6)
 
-    def on_mouse_press(self, x, y, buttons, modifiers):
-        for ap in self.ap.values():
-            self.store[ap.bssid][x, y] = ap.power
-        self.save_data()
-    
+    def on_mouse_press(self, x, y, button, modifiers):
+        if button == mouse.LEFT:
+            x, y = self.screen2map(x, y)
+            for ap in self.ap.values():
+                self.store[ap.bssid][x, y] = ap.power
+            self.save_data()
+   
+    def on_mouse_drag(self, x, y, dx, dy, button, modifiers):
+        if button == mouse.RIGHT:
+            self.img_pos[0] += dx
+            self.img_pos[1] += dy
+
+    def on_mouse_scroll(self, x, y, scroll_x, scroll_y):
+        if scroll_y > 0:
+            self.img_zoom /= 0.8 * scroll_y
+        if scroll_y < 0:
+            self.img_zoom *= 0.8 * -scroll_y
+
     def on_key_release(self, symbol, mods):
         self.grid = {}