updates to code, mostly fixing shouryas yield thingies

Author: abhiramasonny

main.py

@@ -9,50 +9,35 @@ def main(tryall=True):
 
     if not tryall:
         cam1 = cv2.VideoCapture(1)
-        #cam2 = cv2.VideoCapture(1)
+        #cam2 = cv2.VideoCapture(0)
         cameras = [
             (cam1, "Zone 1")#, (cam2, 'Zone 2')
         ]
     else:
         cameras = [(cv2.VideoCapture(i), f"Zone {i+1}") for i in range(countCameras())]
 
     for i in gun_detection.run_detection(cameras):
-        #print(f'{i}')
         print(type(i))
         if type(i) == dict:
             if 1 in list(i.values()):
                 for key, value in i.items():
                     if value == 1:
                         print(f'Gunman in {key}')
-                        #sendP(key[-1])
             else:
                 print('No Gunman found')
-
-            #sendP(i)
-            #if type(i) != int:
-            #   break
         else:
-            # if this is running we have had a gun man for more that 4 ticks 
-            print('you goofy goober')
-            clothes_detection = ClothesDetection(len(cameras))
+            clothes_detection = ClothesDetection(len(cameras),cameras)
             wearing,colour = clothes_detection.run_detection(cameras)
             print(f"wearing {wearing} and RGB {colour}")
-            while True:
-                    for i in gun_detection.run_detection(cameras):
-                        #print(f'{i}')
+            for i in gun_detection.run_detection(cameras):
                         print(type(i))
                         if type(i) == dict:
                             if 1 in list(i.values()):
                                 for key, value in i.items():
                                     if value == 1:
                                         print(f'Gunman in {key}')
-                                        #sendP(key[-1])
                             else:
                                 print('No Gunman found')
-
-                            #sendP(i)
-                            #if type(i) != int:
-                            #   break
-
+    gun_detection.run_detection(cameras)                  
 if __name__ == "__main__":
     main(tryall=False)

src/yolov8/__pycache__/detection.cpython-310.pyc

@@ -11,7 +11,7 @@ class GunDetection:
     def __init__(self, weight_path: str):
         self.yolo_detector = YoloObjD(weight_path)
 
-    def run_detection(self, cameras: list, single_frame_mode: bool = False, single_frame_path: str = None) -> bool:
+    def run_detection(self, cameras: list) -> bool:
         consecutive_gun_detected_count = 0
         buffer_iteration_count = 4
         start_time = time.time()
@@ -23,7 +23,7 @@ def run_detection(self, cameras: list, single_frame_mode: bool = False, single_f
             gunManPos = {}
 
             for cam, window_name in cameras:
-                ret, frame, boxes, cords = run(self.yolo_detector, cam, window_name, single_frame_mode, single_frame_path)
+                ret, frame, boxes, cords = run(self.yolo_detector, cam, window_name)
                 cordlist.append(cords)
                 if cords != (0,0,0,0):
                     gunManPos.update({window_name: 1})
@@ -77,11 +77,11 @@ def run_detection(self, cameras: list, single_frame_mode: bool = False, single_f
         yield False
 
 class ClothesDetection:
-    def __init__(self, num_cameras: int, isframe=False, frame=None):
+    def __init__(self, num_cameras, cap_list, isframe=False, frame=None):
         self.isframe = isframe
         if not self.isframe:
             self.models = [Load_DeepFashion2_Yolov3() for _ in range(num_cameras)]
-            self.cap_list = [cv2.VideoCapture(i) for i in range(num_cameras)]
+            self.cap_list = cap_list
         else:
             self.models = [Load_DeepFashion2_Yolov3()]
             self.frame = frame
@@ -90,9 +90,9 @@ def __init__(self, num_cameras: int, isframe=False, frame=None):
     def run_detection(self, cameras: list):
         gunman_is_wearing = ""
         avg_rgb_values = []
-        while len(gunman_is_wearing)==0:
+        while len(gunman_is_wearing) == 0:
             if not self.isframe:
-                frames = [cap.read()[1] for cap in self.cap_list]
+                frames = [cap[0].read()[1] for cap in self.cap_list]
                 ret_list = [frame is not None for frame in frames]
                 if not all(ret_list):
                     break
@@ -141,7 +141,7 @@ def run_detection(self, cameras: list):
                 break
         if not self.isframe:
             for cap in self.cap_list:
-                cap.release()
+                cap[0].release()
             cv2.destroyAllWindows()
         return (gunman_is_wearing,avg_rgb_values)
     def get_avg_rgb(self, box_array: list, frame: np.ndarray) -> list:

src/yolov8/__pycache__/yoloProcessFrame.cpython-310.pyc

@@ -35,14 +35,11 @@ def calculate_contrast_font_color(self, img: np.ndarray, x: int, y: int, w: int,
         contrast_color = [0, 0, 0]
         return contrast_color
 
-def run(yolo_detector: YoloObjD, cam: cv2.VideoCapture, window_name: str, single_frame_mode: bool = False, single_frame_path: str = None) -> tuple:
-    if single_frame_mode:
-        frame_info = cv2.imread(single_frame_path)
-    else:
-        ret, frame_info = cam.read()
-        if not ret:
-            return False, None, 0,-1
-
+def run(yolo_detector: YoloObjD, cam: cv2.VideoCapture, window_name: str) -> tuple:
+    ret, frame_info = cam.read()
+    if not ret:
+        return False, None, 0,-1
+    
     frame, boxes,cords = yolo_detector.process_frame(frame_info)
     print(boxes)
     return True, frame, boxes,cords