Changeset 436 for trunk/src/visualization/__init__.py

Timestamp:

09/25/09 14:02:04 (3 years ago)

Author:

apdavison

Message:

Modified the mapping of cell id to image position for plotting activity maps/movies.

Files:

• trunk/src/visualization/__init__.py (modified) (3 diffs)

trunk/src/visualization/__init__.py

@@ -103 +103 @@
         return self.t, numpy.sin(self.t + self.phase)
 
-def xy2ij(coordinates):
+def xy2ij(coordinates, height):
     """
     Generally, we use (x,y) coordinates, but since arrays use matrix coordinates,
@@ -109 +109 @@
     """
     assert len(coordinates) == 2
-    return (coordinates[1], coordinates[0])
+    x,y = coordinates
+    j = x
+    i = height - 1 - y
+    return (i,j)
 
 class ActivityMap(object):
@@ -122 +125 @@
             raise Exception("Dimensions of the population are not defined ! Set spikelist.dims")
         
-        self.time, self.pos = self.spikelist.convert("times, ids")
+        self.time, self.ids = self.spikelist.convert("times, ids")
         # We sort the spikes to allow faster process later
         sort_idx = self.time.ravel().argsort(kind="quicksort")
         self.time = self.time[sort_idx]
-        self.pos = self.pos[sort_idx]
-        self.idx = 0
-        self.max_idx = len(self.time)-1
+        self.ids = self.ids[sort_idx]
+        self.i = 0
+        self.max_i = len(self.time)-1
         self.t_start = 0
         
     def next_frame(self):
         spk = self.spikelist
-        activity_map = numpy.zeros(xy2ij(spk.dimensions))
-        
-        while ((self.idx < self.max_idx) and (self.time[self.idx] < self.t_start + self.frame_duration)):
-            addr = spk.id2position(self.pos[self.idx])
-            activity_map[xy2ij(addr)] += 1
-            self.idx += 1
+        activity_map = numpy.zeros(spk.dimensions)
+        h,w = spk.dimensions
+        id_offset = min(spk.id_list())
+        while (self.i < self.max_i) and (self.time[self.i] < self.t_start + self.frame_duration):
+            xy = spk.id2position(self.ids[self.i] - id_offset) 
+            activity_map[xy2ij(xy, h)] += 1
+            self.i += 1
         self.t_start += self.frame_duration
-        #logging.debug("next_frame: idx=%d, t_start=%g, max_idx=%d, time[idx]=%g" % (self.idx, self.t_start, self.max_idx, self.time[self.idx]))
+        #logging.debug("next_frame: i=%d, t_start=%g, max_i=%d, time[i]=%g" % (self.i, self.t_start, self.max_i, self.time[self.i]))
         activity_map *= 1000.0/self.frame_duration # convert to spikes/second    
         return [activity_map]