derp

SWiT · Jul 26, 2014 · 16473b0 · 16473b0
1 parent b22aa10
commit 16473b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/arena.py b/arena.py
@@ -31,7 +31,7 @@ def __init__(self):
             raise SystemExit('No video device found. (/dev/video#)')
         self.videodevices.sort()  
         self.serialdevices.sort()
-        #print self.serialdevices
+        print self.serialdevices
         self.buildZones()
         self.buildBots()
         return

diff --git a/rfcarena.py b/rfcarena.py
@@ -124,8 +124,9 @@
         if ui.display == -1:
             if allImg is None or z.id == 0: #not set or first
                 allImg = zeros((height, width*Arena.numzones, 3), uint8)
-            #print z.id, height, width, Arena.numzones
-            allImg[0:height, (z.id*width):((z.id+1)*width)] = outputImg
+            #print z.id, height, width, Arena.numzones, size(outputImg,0), size(outputImg,1)
+            if size(outputImg,0) == height and size(outputImg,1) == width:
+                allImg[0:height, (z.id*width):((z.id+1)*width)] = outputImg
             if z.id+1 == len(Arena.zone):   #last
                 outputImg = allImg