Update app.py

app.py

@@ -280,77 +280,62 @@ def video_frame_callback(frame: av.VideoFrame) -> av.VideoFrame:
             #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 < angleKneeL < 110 and 29 < angleHipL < 40:
-                cv2.putText(image, "Squat Detected!", (300, 100), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 255, 0), 3)
-            else:
-                if angleHipL < 29:
-                    cv2.putText(image, "Lean Forward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
-                elif angleHipL > 45:
-                    cv2.putText(image, "Lean Backward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
-                if angleKneeL < 80:
-                    cv2.putText(image, "Squat Too Deep!", (300, 250), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
-                elif angleKneeL > 110:
-                    cv2.putText(image, "Lower Your Hips!", (300, 300), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+            # # Squat logic
+            # if 80 < angleKneeL < 110 and 29 < angleHipL < 40:
+            #     cv2.putText(image, "Squat Detected!", (300, 100), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 255, 0), 3)
+            # else:
+            #     if angleHipL < 29:
+            #         cv2.putText(image, "Lean Forward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+            #     elif angleHipL > 45:
+            #         cv2.putText(image, "Lean Backward!", (300, 200), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+            #     if angleKneeL < 80:
+            #         cv2.putText(image, "Squat Too Deep!", (300, 250), cv2.FONT_HERSHEY_SIMPLEX, 2, (0, 0, 255), 3)
+            #     elif angleKneeL > 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)
-
-# 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)
+            # 1. Bend Forward Warning
+            if 10 < angleHipL < 18:
+               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:
+               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:
+               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)
+            # 3. Knees not low enough and not completed the squat 
+            if angleKneeL>130 and stage=='mid':
+               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)
+               incorrect+=1
+               stage='up'
+
+            # 4. Squat too deep
+            if angleKneeL < 80 and stage=='mid':
+               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)
+               incorrect +=1
+               stage='up'
+
+            # stage 4 
+            if (80 < angleKneeL < 110) and stage=='mid':
+               if (18 < angleHipL < 40):  # Valid "down" position
+                   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