commit

src/python2/pjibot/camera-errorBag.json

@@ -47,5 +47,6 @@
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-36-14_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-53-53_obstacledetection_44/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-14-36-20_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-14-37-08_obstacledetection_3/"
+    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-14-37-08_obstacledetection_3/", 
+    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-16-02-26_obstacledetection_30/"
 ]

src/python2/pjibot/csv-errorBag.json

@@ -68,5 +68,6 @@
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-12-09-44-23_obstacledetection_29/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-14-17-59-21_obstacledetection_30/", 
     "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-36-14_obstacledetection_30/", 
-    "pjibot/pjibot-P1YNYD1M223000101/data_parse/2024-11-15-10-53-53_obstacledetection_44/"
+    "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/"
 ]

src/python2/pjibot/resource/bagtocsv_rebot.py

@@ -307,7 +307,7 @@ def parse(costmap_bag, data_bag, output_dir):
     # global_bagfile = '/media/dell/56FAD34BFAD32651/data/pujin_datareturn/20240428/costmap.bag'
     input_dir = data_bag  # 触发采集的rosbag包
     # input_dir='/media/dell/56FAD34BFAD32651/data/pujin_datareturn/20240428/2024-04-25-15-58-27_obstacledetection_30.bag'
-    bagname = input_dir.split('/')[-1].split('.')[0]
+    bagname = input_dir.split('/')[-1].split('.bag')[0]
     # output_dir='/media/dell/56FAD34BFAD32651/data/pujin_datareturn/20240428'
     global_topic = '/move_base/global_costmap/costmap'
     local_topic = '/move_base/local_costmap/costmap'

src/python2/pjibot_delivery/resource/bagtocsv_robot.py

@@ -221,7 +221,7 @@ def parse(input_dir, output_dir):
     # output_dir='/media/dell/HIKSEMI/pji_DGNC'
     # input_dir=sys.argv[1]
     # output_dir = sys.argv[2]
-    bagname = input_dir.split('/')[-1].split('.')[0]
+    bagname = input_dir.split('/')[-1].split('.bag')[0]
 
     output_dir = os.path.join(output_dir, bagname)
     if not os.path.exists(output_dir):

src/python2/pjibot_patrol/resource/bagtocsv_robot.py

@@ -221,7 +221,7 @@ def parse(input_dir, output_dir):
     # output_dir='/media/dell/HIKSEMI/pji_DGNC'
     # input_dir=sys.argv[1]
     # output_dir = sys.argv[2]
-    bagname = input_dir.split('/')[-1].split('.')[0]
+    bagname = input_dir.split('/')[-1].split('.bag')[0]
 
     output_dir = os.path.join(output_dir, bagname)
     if not os.path.exists(output_dir):

src/python2/pjisuv/resource/drive_csv.py

@@ -68,7 +68,7 @@ def parsebag(input_dir, output_dir):
 
 
 def parse(input_dir, output_dir):
-    bagname = input_dir.split('/')[-1].split('.')[0]
+    bagname = input_dir.split('/')[-1].split('.bag')[0]
     output_dir = os.path.join(output_dir, bagname)
     if not os.path.exists(output_dir):
         os.makedirs(output_dir)

src/python2/pjisuv/resource/pos_orig_csv.py

@@ -81,7 +81,7 @@ def parsebag(input_dir, output_dir):
 
 
 def parse(input_dir, output_dir):
-    bagname = input_dir.split('/')[-1].split('.')[0]
+    bagname = input_dir.split('/')[-1].split('.bag')[0]
     output_dir = os.path.join(output_dir, bagname)
     if not os.path.exists(output_dir):
         os.makedirs(output_dir)