Update app.py

app.py

@@ -24,11 +24,10 @@ def show_preds_video():
         count += 1
         if count % 2 != 0:
             continue
-            # frame = cv2.imread(video_path)
+
         frame=cv2.resize(frame,(1020,600))
         frame_copy = frame.copy()
-        car_cnt = 0
-        truck_cnt = 0
+        Vehicle_cnt = 0
 
         results=model(frame)
         for index, row in results.pandas().xyxy[0].iterrows():
@@ -41,28 +40,29 @@ def show_preds_video():
             cx=int(x1+x2)//2
             cy=int(y1+y2)//2
 
-            if ('car') in d:
+            if ('car' or 'truck') in d:
                 results = cv2.pointPolygonTest(np.array(area, np.int32), ((cx,cy)), False)
                 if results >0:
                         cv2.rectangle(frame_copy,(x1,y1),(x2,y2),(0,0,255),2)
                         cv2.putText(frame_copy,str(d),(x1,y1),cv2.FONT_HERSHEY_PLAIN,2,(255,255,0),2)
-                        car_cnt += 1
+                        Vehicle_cnt += 1
 
-            elif ('truck') in d:
-                results = cv2.pointPolygonTest(np.array(area, np.int32), ((cx,cy)), False)
-                if results >0:
-                    cv2.rectangle(frame_copy,(x1,y1),(x2,y2),(0,0,255),2)
-                    cv2.putText(frame_copy,str(d),(x1,y1),cv2.FONT_HERSHEY_PLAIN,2,(255,0,0),2)
-                    truck_cnt += 1       
+            # elif ('truck') in d:
+            #     results = cv2.pointPolygonTest(np.array(area, np.int32), ((cx,cy)), False)
+            #     if results >0:
+            #         cv2.rectangle(frame_copy,(x1,y1),(x2,y2),(0,0,255),2)
+            #         cv2.putText(frame_copy,str(d),(x1,y1),cv2.FONT_HERSHEY_PLAIN,2,(255,0,0),2)
+            #         truck_cnt += 1       
         
-        free_space = total_space - (car_cnt + truck_cnt)
+        free_space = total_space - Vehicle_cnt
         cv2.putText(frame_copy, ("Free space: " + str(free_space)), (50,50) ,cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
-        cv2.putText(frame_copy, str(str("  car: ")+ str(car_cnt) + str("  truck: ") +str(truck_cnt)), (50,75) ,cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
+        # cv2.putText(frame_copy, str(str("  car: ")+ str(car_cnt) + str("  truck: ") +str(truck_cnt)), (50,75) ,cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
+        cv2.putText(frame_copy, str(str("vehicles: ")+ str(Vehicle_cnt) ), (50,85) ,cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
         
         cv2.polylines(frame_copy, [np.array(area, np.int32)], True, (0,255,0), 2) 
 
-        fps = cap.get(cv2.CAP_PROP_FPS)
-        cv2.putText(frame_copy,str("fps:  ") + str(np.round(fps,0)),(50,100),cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
+        # fps = cap.get(cv2.CAP_PROP_FPS)
+        # cv2.putText(frame_copy,str("fps:  ") + str(np.round(fps,0)),(50,100),cv2.FONT_HERSHEY_PLAIN,2,(0,255,0),2)
 
         yield cv2.cvtColor(frame_copy, cv2.COLOR_BGR2RGB)