commit

src/python2/pjibot/camera-errorBag.json

@@ -9,6 +9,7 @@
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-09-08-07-53-47_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-08-26-06-33-08_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-43-07_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-01-02-45-20_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-09-02-09-23_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-14-17-59-21_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-09-06-07-55-18_obstacledetection_30/", 
@@ -16,8 +17,8 @@
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-11-03-41-15_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-31-11-01-15_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-09-20-01-06-56_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-34-00/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-12-01-58-10_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-35-32_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-16-39_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-36-14_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-32-26/", 
@@ -29,17 +30,16 @@
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-17-00-41-23_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-30-25/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-29-09-46-26_obstacledetection_42/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-10-02-45-27_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-47-59/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-23-03-56-04_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-33-00_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-11-04-18-13_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-42-03_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-04-02-04-27_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-06-09-35-05_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-14-09-15-22_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000131/data_parse/2024-11-11-02-45-56_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-14-18-00-33_obstacledetection_3/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-23-03-56-04_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-17-29_obstacledetection_43/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-10-02-45-27_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-31-40_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-25-10-02-50_obstacledetection_45/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-18-02-55-46_obstacledetection_30/", 
@@ -50,19 +50,20 @@
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-15-15-20-20_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-53-53_obstacledetection_44/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-16-02-26_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M229000131/data_parse/2024-11-11-02-40-36_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-04-02-43-41_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-12-02-05-06_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-14-37-08_obstacledetection_3/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-24-01-30-02_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-31-10/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-12-09-44-23_obstacledetection_29/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-16-05-31-12_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-09-11-07-58-14_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-45-29/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-09-09-04-07-16_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-27-25/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-34-00/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-10-11-04-18-13_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-31-10/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-47-59/", 
+    "pjibot/pjibot-P1YNYD1M229000131/data_parse/2024-11-11-02-40-36_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-35-32_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-09-01-02-37-18_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-01-02-45-20_obstacledetection_30/"
+    "pjibot/pjibot-P1YNYD1M227000119/data_parse/2024-07-03-06-17-29_obstacledetection_43/"
 ]

src/python2/pjibot/csv-errorBag.json

@@ -8,14 +8,13 @@
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-09-55-16_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-20-35-53_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-29-11-18-30_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-13-04-24_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-30-25/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-03-18-13-53_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-29-09-46-26_obstacledetection_42/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-11-39-55/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-23-01-07-36_obstacledetection_45/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-20-45-18_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-25-10-02-50_obstacledetection_45/", 
+    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-43-02/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-06-01-17-06_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-23-25-14_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-07-07-09-53-10_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-08-57-58_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-23-06-46_obstacledetection_30/", 
@@ -32,12 +31,13 @@
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-31-11-01-15_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-22-28-41_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-01-03-21-14_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-30-25/", 
+    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-13-04-24_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-11-39-28_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000131/data_parse/2024-11-11-02-45-56_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-08-05-21-49-38_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-01-03-27-01_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-07-04-02-26-31_obstacledetection_38/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-05-07-17-30_obstacledetection_60/", 
+    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-12-19-33_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000131/data_parse/2024-11-11-02-40-36_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-06-00-48-28_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-12-09-44-23_obstacledetection_29/", 
@@ -47,10 +47,10 @@
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-47-59/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-06-00-52-30_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-10-48-35_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-05-07-17-30_obstacledetection_60/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-07-04-02-26-31_obstacledetection_38/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-10-28-16-09-39_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-40-28/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-43-02/", 
+    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-25-10-02-50_obstacledetection_45/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-14-17-59-21_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-25-09-54-00_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-13-17-07_obstacledetection_30/", 
@@ -58,7 +58,7 @@
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-32-26/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-19-06-36_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-10-29-09-00-48_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-12-19-33_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-23-25-14_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-08-39-25_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-18-12-00-09_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-22-11-48_obstacledetection_30/", 
@@ -83,7 +83,7 @@
     "pjibot/pjibot-P1YNYD1M227000116/data_parse/2024-11-07-16-39-17_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-11-32-18_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-05-23-59-29_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-11-39-55/", 
+    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-29-09-46-26_obstacledetection_42/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-12-20-06-07-28_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-14-07-41_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-09-03-11-18-07_obstacledetection_30/", 
@@ -94,5 +94,6 @@
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-12-15-15-20-20_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M227000115/data_parse/2024-08-06-00-38-07_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M229000129/data_parse/2024-07-07-09-31-48_obstacledetection_30/", 
+    "pjibot/pjibot-P1YNYD1M229000129/data_parse/2025-01-04-02-43-41_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M225000112/data_parse/TS100M36-BJ-dock-2024-09-29-15-31-10/"
 ]

src/python2/pjibot/csv-nohup.sh

@@ -6,4 +6,5 @@ else
     echo "Directory './log' already exists."
 fi
 rm -rf log/csv-pjibot_guide.out log/csv-pjibot_guide.log log/csv.log log/csv.out
+# source /root/workspace/devel/setup.sh
 nohup python2 csv-pjibot_guide.py > log/csv-pjibot_guide.out 2>&1 &

src/python2/pjibot/csv-pjibot_guide.py

@@ -13,8 +13,9 @@ import io
 from resource import bagtocsv_robot
 from utils import json_utils
 path1 = '/mnt/disk001/dcl_data_process/src/python2/pjibot/'
-path2 = '/mnt/disk001/run' # 生成评价报告pdf的可执行文件路径
-command_report = './pji_single'
+path2 = '/mnt/disk001/pdf_indoor' # 生成评价报告pdf的可执行文件路径
+command_report = './single_case_eval'
+config_json_path = '/mnt/disk001/pdf_indoor/config.json'
 path3 = '/mnt/disk001/dcl_data_process/src/python3/pjibot_indoor'
 path4 = '/mnt/disk001/dcl_data_process/src/python3/pjibot_indoor/filter_pos.py'
 pgm_path = '/mnt/disk001/dcl_data_process/src/python3/pjibot_indoor/resource/shiyanshi_newpgm_20240416.pgm'
@@ -99,7 +100,7 @@ def parse_csv(costmap_bag, data_bag, parse_prefix, local_parse_dir, local_delete
         # ------- 生成 pdf 报告 - 开始 -------
         #  ------- 根据合并后的包和map.bag 生成轨迹图片 - 开始 -------
         # 获取只有1帧率的数据包
-        map_key = parse_prefix.replace('data_parse/', '') + 'map.bag'
+        map_key = parse_prefix + 'map.bag'
         local_map_path = local_parse_dir + 'map.bag'
         logging.info("map.bag包的key为: %s" % str(map_key))
         bucket.get_object_to_file(map_key, local_map_path)
@@ -123,7 +124,8 @@ def parse_csv(costmap_bag, data_bag, parse_prefix, local_parse_dir, local_delete
 
             # 构建生成PDF报告的命令
             data_bag_base = data_bag.split('/')[-1].split('.')[0]
-            command1 = [command_report, local_csv_dir, local_csv_dir, os.path.join(local_csv_dir, 'track1.png'), data_bag_base]
+            # command1 = [command_report, local_csv_dir, local_csv_dir, os.path.join(local_csv_dir, 'track1.png'), data_bag_base]
+            command1 = [command_report, local_csv_dir, config_json_path]
 
             # 打印调用生成PDF报告命令的日志
             logging.info("调用生成pdf 报告命令: %s" % ' '.join(command1))