20241217

tracking/utils/drawtracks.py

@@ -364,7 +364,10 @@ def drawTrack(tracks, img):
     annotator = TrackAnnotator(img, line_width=2)
     
     for track in tracks:
-        annotator.plotting_track(track.boxes)
+        if isinstance(track, np.ndarray):
+            annotator.plotting_track(track)
+        else:
+            annotator.plotting_track(track.boxes)
     img = annotator.result()    
     
     # pth = save_dir.joinpath(f"{filename}")

tracking/utils/read_data.py

@@ -202,9 +202,9 @@ def read_tracking_output(filepath):
 
 
     if len(feats) != len(boxes):
-        return np.array([]), np.array([])
+        return [np.array([])], [np.array([])]
     
-    return np.array(boxes), np.array(feats) 
+    return [np.array(boxes)], [np.array(feats)] 
     
 
 def read_deletedBarcode_file(filePath):
@@ -408,7 +408,8 @@ def read_similar(filePath):
 
         if len(one2one_list): SimiDict['one2one'] = one2one_list
         if len(one2n_list): SimiDict['one2n'] = one2n_list
-
+        if len(one2SN_list): SimiDict['one2SN'] = one2SN_list
+    
     return SimiDict
 
 
@@ -532,13 +533,12 @@ def main():
             break
         
 def main1():
-    fpath = r'\\192.168.1.28\share\测试_202406\1101\images\20241101-140456-44dc75b5-c406-4cb2-8317-c4660bb727a3_6922130101355_6922130101355\process.data'
-    simidct = read_one2one_simi(fpath)
+    fpath = r'\\192.168.1.28\share\测试视频数据以及日志\各模块测试记录\比对测试\1209永辉超市测试\20241209-155924-117e1941-70f8-4287-8de1-4866868548a6_6926475209967\process.data'
+    simidct = read_similar(fpath)
     print(simidct)
           
 
 if __name__ == "__main__":
-    # main()
     main1()
 
 
@@ -552,3 +552,4 @@ if __name__ == "__main__":
 
 
 
+