1 files changed, 49 insertions, 38 deletions

diff --git a/megapixels/commands/cv/face_pose.py b/megapixels/commands/cv/face_pose.py
index c37d006f..9979ad34 100644
--- a/megapixels/commands/cv/face_pose.py
+++ b/megapixels/commands/cv/face_pose.py
@@ -1,5 +1,9 @@
 """
 Converts ROIs to pose: yaw, roll, pitch
+pitch: looking down or up in yes gesture
+roll: tilting head towards shoulder
+yaw: twisting head left to right in no gesture
+
 """
 
 import click
@@ -17,7 +21,7 @@ from app.settings import app_cfg as cfg
   help='Override enum media directory')
 @click.option('--data_store', 'opt_data_store',
   type=cfg.DataStoreVar,
-  default=click_utils.get_default(types.DataStore.SSD),
+  default=click_utils.get_default(types.DataStore.HDD),
   show_default=True,
   help=click_utils.show_help(types.Dataset))
 @click.option('--dataset', 'opt_dataset',
@@ -91,50 +95,57 @@ def cli(ctx, opt_fp_in, opt_fp_out, opt_dir_media, opt_data_store, opt_dataset,
   # store poses and convert to DataFrame
   poses = []
 
-  # iterate 
+  # iterate groups with file/record index as key
   for record_index, df_img_group in tqdm(df_img_groups):
     # make fp
     ds_record = df_record.iloc[record_index]
     fp_im = data_store.face(ds_record.subdir, ds_record.fn, ds_record.ext)
     im = cv.imread(fp_im)
-    # get bbox
-    x = df_img_group.x.values[0]
-    y = df_img_group.y.values[0]
-    w = df_img_group.w.values[0]
-    h = df_img_group.h.values[0]
-    dim = im.shape[:2][::-1]
-    bbox = BBox.from_xywh(x, y, w, h).to_dim(dim)
-    # get pose
-    landmarks = face_landmarks.landmarks(im, bbox)
-    pose_data = face_pose.pose(landmarks, dim, project_points=opt_display)
-    pose_degrees = pose_data['degrees']  # only keep the degrees data
-
-    # use the project point data if display flag set
-    if opt_display:
-      pts_im = pose_data['points_image']
-      pts_model = pose_data['points_model']
-      pt_nose = pose_data['point_nose']
-      dst = im.copy()
-      face_pose.draw_pose(dst, pts_im, pts_model, pt_nose)
-      face_pose.draw_degrees(dst, pose_degrees)
-      # display to cv window
-      cv.imshow('', dst)
-      while True:
-        k = cv.waitKey(1) & 0xFF
-        if k == 27 or k == ord('q'):  # ESC
-          cv.destroyAllWindows()
-          sys.exit()
-        elif k != 255:
-          # any key to continue
-          break
-
-    # add image index and append to result CSV data
-    pose_degrees['record_index'] = record_index
-    poses.append(pose_degrees)
+    # iterate image group dataframe with roi index as key
+    for roi_index, df_img in df_img_group.iterrows():
+      # get bbox
+      x, y, w, h = df_img.x, df_img.y, df_img.w, df_img.h
+      dim = (ds_record.width, ds_record.height)
+      #dim = im.shape[:2][::-1]
+      bbox = BBox.from_xywh(x, y, w, h).to_dim(dim)
+      # get pose
+      landmarks = face_landmarks.landmarks(im, bbox)
+      pose_data = face_pose.pose(landmarks, dim)
+      #pose_degrees = pose_data['degrees']  # only keep the degrees data
+      #pose_degrees['points_nose'] = pose_data
+      # use the project point data if display flag set
+      if opt_display:
+        dst = im.copy()
+        face_pose.draw_pose(dst, pose_data['point_nose'], pose_data['points'])
+        face_pose.draw_degrees(dst, pose_data)
+        # display to cv window
+        cv.imshow('', dst)
+        while True:
+          k = cv.waitKey(1) & 0xFF
+          if k == 27 or k == ord('q'):  # ESC
+            cv.destroyAllWindows()
+            sys.exit()
+          elif k != 255:
+            # any key to continue
+            break
 
+      # add image index and append to result CSV data
+      pose_data['roi_index'] = roi_index
+      for k, v in pose_data['points'].items():
+        pose_data[f'point_{k}_x'] = v[0][0] / dim[0]
+        pose_data[f'point_{k}_y'] = v[0][1] / dim[1]
+      pose_data.pop('points')
+      pose_data['point_nose_x'] = pose_data['point_nose'][0] / dim[0]
+      pose_data['point_nose_y'] = pose_data['point_nose'][1] / dim[1]
+      pose_data.pop('point_nose')
+      poses.append(pose_data)
 
-  # save date
+  # create dataframe
   file_utils.mkdirs(fp_out)
   df = pd.DataFrame.from_dict(poses)
+  # save date
   df.index.name = 'index'
-  df.to_csv(fp_out)
\ No newline at end of file
+  df.to_csv(fp_out)
+  # save script
+  cmd_line = ' '.join(sys.argv)
+  file_utils.write_text(cmd_line, '{}.sh'.format(fp_out))
\ No newline at end of file