Update app.py

app.py

@@ -227,17 +227,16 @@ def calculate_angle(a, b, c):
     a = np.array(a)
     b = np.array(b)
     c = np.array(c)
-    radians = np.arctan2(c[1] - b[1], c[0] - b[0]) - np.arctan2(a[1] - b[1], a[0] - b[0])
+    radians = np.arctan2(c[1]-b[1], c[0]-b[0]) - np.arctan2(a[1]-b[1], a[0]-b[0])
     angle = np.abs(radians * 180.0 / np.pi)
     if angle > 180.0:
         angle = 360 - angle
     return angle
 
-counterL = 0  # Counter checks for number of curls
-correct = 0
-incorrect = 0
-stage = None  # it checks if we our hand is UP or DOWN
-
+counterL=0#Counter checks for number of curls
+correct=0
+incorrect=0
+stage=None#it checks if we our hand is UP or DOWN
 
 # Detection Queue
 result_queue: "queue.Queue[List[Detection]]" = queue.Queue()
@@ -249,12 +248,7 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
 
     with mp_pose.Pose(min_detection_confidence=0.5, min_tracking_confidence=0.5) as pose:
         results = pose.process(image_rgb)
-        # If landmarks are detected, proceed
-        if results.pose_landmarks:
-            landmarks = results.pose_landmarks.landmark
-        else:
-            landmarks = []
-        cv2.putText(image, "No Pose Detected", (10, 60), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 255), 2, cv2.LINE_AA)
+        landmarks = results.pose_landmarks.landmark if results.pose_landmarks else []
 
         # Corrected detection logic
         detections = [
@@ -270,84 +264,114 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
             hipL = [landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].x, 
                    landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].y]
             kneeL = [landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].x, 
-                     landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].y]
+                    landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].y]
             ankleL = [landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].x, 
-                      landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].y]
+                     landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].y]
             shoulderL = [landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].x, 
-                         landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y]
+                        landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y]
             footIndexL = [landmarks[mp_pose.PoseLandmark.LEFT_FOOT_INDEX.value].x, 
-                          landmarks[mp_pose.PoseLandmark.LEFT_FOOT_INDEX.value].y]
+                    landmarks[mp_pose.PoseLandmark.LEFT_FOOT_INDEX.value].y]
 
             # Calculate angles
-            angleKneeL = calculate_angle(hipL, kneeL, ankleL)
-            angleHipL = calculate_angle(shoulderL, hipL, [hipL[0], 0])
-            angleAnkleL = calculate_angle(footIndexL, ankleL, kneeL)
+            angleKneeL = calculate_angle(hip, knee, ankle)
+            angleHipL = calculate_angle(shoulder, hip, [hip[0], 0])
+            angleAnkleL = calculate_angle(foot, ankle, knee)
             
-            # Visualize of left leg
-            cv2.putText(image, str(angleHipL), tuple(np.multiply(angleHipL, [640, 480]).astype(int)), 
-                        cv2.FONT_HERSHEY_SIMPLEX, 0.5, (255, 255, 255), 2, cv2.LINE_AA)
-
-            #Squat Logic
+            #Visualize of left leg
+            cv2.putText(image, str(angleHipL),tuple(np.multiply(angleHipL, [640, 480]).astype(int)),cv2.FONT_HERSHEY_SIMPLEX, 0.5, (255, 255, 255), 2, cv2.LINE_AA)
+            
+            # Squat logic
+            if 80 < knee_angle < 110 and 29 < hip_angle < 40:
+                cv2.putText(image, "Squat Detected!", (300, 100), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 255, 0), 3)
+            else:
+                if hip_angle < 29:
+                    cv2.putText(image, "Lean Forward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+                elif hip_angle > 45:
+                    cv2.putText(image, "Lean Backward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+                if knee_angle < 80:
+                    cv2.putText(image, "Squat Too Deep!", (300, 250), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+                elif knee_angle > 110:
+                    cv2.putText(image, "Lower Your Hips!", (300, 300), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
             
-            # 1. Bend Forward Warning
-            if 10 < angleHipL < 18:
-                print(f"AngleHipL when Bend forward warning:{angleHipL}")
-                cv2.rectangle(image, (310, 180), (450, 220), (0, 0, 0), -1)
-                cv2.putText(image, f"Bend Forward", (320, 200), cv2.FONT_HERSHEY_SIMPLEX, 1, (150, 120, 255), 1, cv2.LINE_AA)
-
-            # 2. Lean Backward Warning
-            if angleHipL > 45:
-                print(f"AngleHipL when Bend backward warning:{angleHipL}")
-                cv2.rectangle(image, (310, 180), (450, 220), (0, 0, 0), -1)
-                cv2.putText(image, f"Bend Backward", (320, 200), cv2.FONT_HERSHEY_SIMPLEX, 1, (80, 120, 255), 1, cv2.LINE_AA)
-
-            # Incorrect movements
-            # 3. Knees not low enough
-            if 110 < angleKneeL < 130:
-                print(f"AngleKneeL when Lower Your Hips warning:{angleKneeL}")
-                cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
-                cv2.putText(image, f"Lower Your Hips", (230, 60), cv2.FONT_HERSHEY_SIMPLEX, 1, (255, 255, 255), 1, cv2.LINE_AA)
+    #                                 # 1. Bend Forward Warning
+    # if 10 < angleHipL < 18:
+    #    print(f"AngleHipL when Bend forward warning:{angleHipL}")
+    #    cv2.rectangle(image, (310, 180), (450, 220), (0, 0, 0), -1) 
+    #    cv2.putText(image,f"Bend Forward",
+    #            (320,200),cv2.FONT_HERSHEY_SIMPLEX,1,(150,120,255),1,cv2.LINE_AA)
+
+# 2. Lean Backward Warning
+    if angleHipL > 45:
+       print(f"AngleHipL when Bend backward warning:{angleHipL}")
+       cv2.rectangle(image, (310, 180), (450, 220), (0, 0, 0), -1)
+       cv2.putText(image,f"Bend Backward",
+               (320,200),cv2.FONT_HERSHEY_SIMPLEX,1,(80,120,255),1,cv2.LINE_AA)
+
+# stage 2
+
+# Incorrect movements
+
+# # 3. Knees not low enough
+#     if 110 < angleKneeL < 130:
+#        print(f"AngleKneeL when Lower Your Hips warning:{angleKneeL}")
+#        cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
+#        cv2.putText(image,f"Lower Your Hips",
+#                (230,60),cv2.FONT_HERSHEY_SIMPLEX,1,(255,255,255),1,cv2.LINE_AA)
+       
         
-            # 3. Knees not low enough and not completed the squat 
-            if angleKneeL > 130 and stage == 'mid':
-                print(f"AngleKneeL when Knees not low enough and not completed the squat :{angleKneeL}")
-                cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
-                cv2.putText(image, f"Lower Your Hips", (230, 60), cv2.FONT_HERSHEY_SIMPLEX, 1, (255, 255, 255), 1, cv2.LINE_AA)
-                print(f"Incorrect counter Knees not low enough and not completed the squat :{incorrect}")
-                incorrect += 1
-                stage = 'up'
-
-            # 4. Squat too deep
-            if angleKneeL < 80 and stage == 'mid':
-                print(f"AngleKneeL when Squat too deep warning:{angleKneeL}")
-                cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
-                cv2.putText(image, f"Squat too deep", (230, 60), cv2.FONT_HERSHEY_SIMPLEX, 1, (255, 255, 255), 1, cv2.LINE_AA)
-                print(f"Incorrect counter when Squat too deep warning:{incorrect}")
-                incorrect += 1
-                stage = 'up'
-
-            # stage 4 
-            if (80 < angleKneeL < 110) and stage == 'mid':
-                if (18 < angleHipL < 40):  # Valid "down" position
-                    print(f"AngleKneeL when valid down position:{angleKneeL}")
-                    print(f"AngleHipL when valid down position:{angleHipL}")
-                    print(f"Correct counter when valid down position:{correct}")
-                    correct += 1
-                    stage = 'up'
-            cv2.putText(image, f"Correct:{correct}", (400, 120), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 0), 1, cv2.LINE_AA)
-            cv2.putText(image, f"Incorrect:{incorrect}", (400, 150), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 0), 1, cv2.LINE_AA)
-
-            # Render Counter to our camera screen
-            # Setup Status box
-            cv2.rectangle(image, (0, 0), (500, 80), (245, 117, 16), -1)
+# # 3. Knees not low enough and not completed the squat 
+#     if angleKneeL>130 and stage=='mid':
+#        print(f"AngleKneeL when Knees not low enough and not completed the squat :{angleKneeL}")
+#        cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
+#        cv2.putText(image,f"Lower Your Hips",
+#                (230,60),cv2.FONT_HERSHEY_SIMPLEX,1,(255,255,255),1,cv2.LINE_AA)
+#        print(f"Incorrect counter Knees not low enough and not completed the squat :{incorrect}")
+#        incorrect+=1
+#        stage='up'
+
+# # 4. Squat too deep
+#     if angleKneeL < 80 and stage=='mid':
+#        print(f"AngleKneeL when Squat too deep warning:{angleKneeL}")
+#        cv2.rectangle(image, (220, 40), (450, 80), (0, 0, 0), -1)
+#        cv2.putText(image,f"Squat too deep",
+#                (230,60),cv2.FONT_HERSHEY_SIMPLEX,1,(255,255,255),1,cv2.LINE_AA)
+#        print(f"Incorrect counter when Squat too deep warning:{incorrect}")
+#        incorrect +=1
+#        stage='up'
+
+# # stage 4 
+#     if (80 < angleKneeL < 110) and stage=='mid':
+#       if (18 < angleHipL < 40):  # Valid "down" position
+#        print(f"AngleKneeL when valid down position:{angleKneeL}")
+#        print(f"AngleHipL when valid down position:{angleHipL}")
+#        print(f"Correct counter when valid down position:{correct}")
+#        correct+=1
+#        stage='up'
+#     cv2.putText(image,f"Correct:{correct}",
+#                (400,120),cv2.FONT_HERSHEY_SIMPLEX,1,(0,0,0),1,cv2.LINE_AA)
+#     cv2.putText(image,f"Incorrect:{incorrect}",
+#                (400,150),cv2.FONT_HERSHEY_SIMPLEX,1,(0,0,0),1,cv2.LINE_AA)
+
+#     #Render Counter  to our camera screen
+#     #Setup Status box
+#     cv2.rectangle(image,(0,0),(500,80),(245,117,16),-1)
+    
+#     #REP data
+    
+#     cv2.putText(image,'Left',(10,12),
+#                cv2.FONT_HERSHEY_SIMPLEX,0.5,(0,0,0),1,cv2.LINE_AA)
     
-            # REP data
-            cv2.putText(image, 'Left', (10, 12), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 0, 0), 1, cv2.LINE_AA)
-            cv2.putText(image, str(correct), (10, 60), cv2.FONT_HERSHEY_SIMPLEX, 2, (255, 255, 255), 2, cv2.LINE_AA)
+#     cv2.putText(image,str(correct),
+#                (10,60),cv2.FONT_HERSHEY_SIMPLEX,2,(255,255,255),2,cv2.LINE_AA)
     
-            # Stage data for left leg
-            cv2.putText(image, 'STAGE', (230, 12), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 0, 0), 1, cv2.LINE_AA)
-            cv2.putText(image, stage, (230, 60), cv2.FONT_HERSHEY_SIMPLEX, 1, (255, 255, 255), 1, cv2.LINE_AA)
+#     #Stage data for left leg
+    
+#     cv2.putText(image,'STAGE',(230,12),
+#                cv2.FONT_HERSHEY_SIMPLEX,0.5,(0,0,0),1,cv2.LINE_AA)
+    
+#     cv2.putText(image,stage,
+#                (230,60),cv2.FONT_HERSHEY_SIMPLEX,1,(255,255,255),1,cv2.LINE_AA)
+            
 
         mp_drawing.draw_landmarks(image, results.pose_landmarks, mp_pose.POSE_CONNECTIONS,
                                   mp_drawing.DrawingSpec(color=(255, 175, 0), thickness=2, circle_radius=2),
@@ -357,7 +381,9 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
     return av.VideoFrame.from_ndarray(image, format="bgr24")
 
 
+
 # WebRTC streamer configuration
+
 webrtc_streamer(
     key="squat-detection",
     mode=WebRtcMode.SENDRECV,