face-detect and faces.py updates

1 files changed, 12 insertions, 15 deletions

diff --git a/data/faces.py b/data/faces.py
index 8e60307..491dc5c 100755
--- a/data/faces.py
+++ b/data/faces.py
@@ -1,12 +1,13 @@
 #!/usr/bin/python
 
+import os
 import cv
 import sys
 import math
 
 sk_file = open(sys.argv[1])
 pic_dir = sys.argv[2] + '/'
-out_dir = '~/out/'
+out_dir = '/home/jbw/out/'+sys.argv[1].split('/')[-2] + '/'
 pframe = 0
 limbs = {}
 j1 = 'Head'
@@ -18,27 +19,23 @@ for line in sk_file:
     if frame != 'Frame':
         run = int(run)
         frame = int(frame)
-        if frame != pframe:
-            if j1 in limbs:
-                print 'Monkey1'
-            if j2 in limbs:
-                print 'Monkey2'
-            print 'end'
+        fout = out_dir+str(frame)+'.jpg'
+        if frame != pframe: #and not os.path.exists(fout):
             if j1 in limbs and j2 in limbs:
-                print 'Monkey3'
                 dx = limbs[j1][0] - limbs[j2][0]
                 dy = limbs[j1][1] - limbs[j2][1]
 
                 img = cv.LoadImage(pic_dir+str(pframe)+".jpg")
                 r = math.sqrt(dx*dx+dy*dy)
-                x1 = max(int(limbs[j1][0] - r),0)
-                y1 = max(int(limbs[j1][1] - r),0)
-                x2 = min(int(x1 + 2*r), img.width)
-                y2 = min(int(y1 + 3*r), img.height)
-                sub = cv.GetSubRect(img,(x1,y1,x2-x1,y2-y1))
+                x1 = max(int(limbs[j1][0] - 1.5*r),0)
+                y1 = max(int(limbs[j1][1] - 1.5*r),0)
+                x2 = min(int(x1 + 3*r), img.width-1)
+                y2 = min(int(y1 + 3*r), img.height-1)
+                sub = cv.GetSubRect(img,(x1,y1,max(x2-x1,1),max(y2-y1,1)))
                 #cv.Rectangle(img,(x1,y1),(x2,y2),(0,255,0),3,8,0)
-                cv.SaveImage(out_dir+str(run)+"-"+str(frame)+'.jpg',sub)
-                cv.ShowImage('video', img)
+                print fout
+                cv.SaveImage(fout,sub)
+                #cv.ShowImage('video', img)
                 cv.WaitKey(5)
             pframe = frame 
             limbs = {}