From 5ed93503368b29faf33f77f4280a572f0ba67894 Mon Sep 17 00:00:00 2001
From: Mike Sutherland <msutherl@uci.edu>
Date: Wed, 25 May 2022 23:25:33 -0700
Subject: [PATCH] #54 Exact capture time recorded for each inference

---
 odcl_node.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/odcl_node.py b/odcl_node.py
index 9358cc3..63ffe39 100755
--- a/odcl_node.py
+++ b/odcl_node.py
@@ -107,7 +107,8 @@ def get_next_in_dir(datadir: Path, suffix: str, k=5):
     # odcl data dir is set to a rospy param
     data_dir = rospy.get_param("/odcl/odcldir", "~/odcldata")
     # make a folder with today's date
-    data_dir = Path(data_dir).resolve() / datetime.date.today().strftime("%Y%m%d")
+    todaysdate = datetime.date.today().strftime("%Y%m%d")
+    data_dir = Path(data_dir).resolve() / todaysdate
     # make a directory to save raw images
     raw_image_dir = data_dir / "raw"
     # make a directory to save cropped images
@@ -120,7 +121,7 @@ def get_next_in_dir(datadir: Path, suffix: str, k=5):
     odcl_data_file = data_dir / str(run_id_str + "-data.csv")
 
     # write CSV headers to file
-    headers = "run_id,frame_no,target_no,target_id,img_path,crop_path,score,class,shape_color,letter_color,latitude,longitude,inference_time\n"
+    headers = "run_id,frame_no,target_no,target_id,img_path,crop_path,score,class,shape_color,letter_color,latitude,longitude,inference_time,captime\n"
     with open(odcl_data_file, "a") as f:
         f.write(headers)
 
@@ -138,6 +139,7 @@ def get_next_in_dir(datadir: Path, suffix: str, k=5):
         if capture.isOpened():
             # read raw image from camera
             status, image_raw = capture.read()
+            captime = datetime.datetime.now().strftime("%Y%m%d %H%M%S%f%p")
 
             # get frame number
             frameno_str = str(frameno).rjust(5)
@@ -164,7 +166,7 @@ def get_next_in_dir(datadir: Path, suffix: str, k=5):
             rospy.loginfo(f"\tFound {len(targets)} targets.")
 
             for i, target in enumerate(targets):
-                targetno = str(i).rjust(2)
+                targetno = str(i).ljust(2)
                 # unpack target information
                 lat = target["lat"]
                 lon = target["lon"]
@@ -189,7 +191,7 @@ def get_next_in_dir(datadir: Path, suffix: str, k=5):
                 targetcsvline = f"{run_id},{frameno},{targetno},{targetid},"
                 targetcsvline += f"{raw_img_path},{crop_fname},"
                 targetcsvline += f"{score},{shape},{scolor},{lcolor},{lat},{lon},"
-                targetcsvline += f"{inftime}\n"
+                targetcsvline += f"{inftime},{captime}\n"
                 with open(odcl_data_file, "a") as f:
                     f.write(targetcsvline)