Merge pull request #15 from eroniki/fix_camera_name_in_pose_detection

Fix camera name in pose detection
eroniki · Jun 17, 2019 · de6d02e · de6d02e
2 parents d504194 + 064f688
commit de6d02e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/app.py b/app.py
@@ -529,21 +529,27 @@ def pose_cam(self, exp_id, camera_id):
             room_id = 0
 
         devices = self.rooms[room_id]["devices"]
+        devices.sort()
         camera_name = os.path.basename(devices[int(camera_id)])
 
         fname = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                              "data", exp_id, "raw", str(camera_name), "")
         fname_result_joint = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                           "data", exp_id, "output", "pose", "pose",
                                           str(camera_name))
-
-        self.um.create_folder(fname_result_joint)
+        try:
+            self.um.create_folder(fname_result_joint)
+        except:
+            pass
 
         fname_result_img = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                         "data", exp_id, "output", "pose", "img",
                                         str(camera_name))
 
-        self.um.create_folder(fname_result_img)
+        try:
+            self.um.create_folder(fname_result_img)
+        except:
+            pass
 
         img_files = list()
         if os.path.exists(fname):
@@ -578,7 +584,8 @@ def pose_cam(self, exp_id, camera_id):
                 self.um.dump_json(fname=fname_json,
                                   data=joints.tolist(),
                                   pretty=True)
-                exp.update_metadata(change_pd=True, pd={camera_name: idx})
+                camera_name_full = "/dev/v4l/by-id/" + camera_name
+                exp.update_metadata(change_pd=True, pd={camera_name_full: idx})
 
         return "{n} number of images were processed!".format(n=n-1)
 

diff --git a/experiment.py b/experiment.py
@@ -120,6 +120,8 @@ def create_metadata(self, ts, camera_names, room):
         number_of_images = dict()
         pose_detection = dict()
 
+        camera_names.sort()
+
         for camera in camera_names:
             number_of_images[camera] = 0
             pose_detection[camera] = 0

diff --git a/utils/utils.py b/utils/utils.py
@@ -14,6 +14,7 @@
 import shutil
 import subprocess
 import zipfile
+from collections import OrderedDict
 
 
 class misc(object):
@@ -87,7 +88,7 @@ def read_json(fname):
         data = None
         try:
             with open(fname) as file_handler:
-                data = json.load(file_handler)
+                data = json.load(file_handler, object_pairs_hook=OrderedDict)
         except Exception as e:
             return None
         return data