Update app.py

app.py

@@ -60,7 +60,6 @@ def classifyPose(landmarks, output_image, display=False):
     Returns:
         output_image: The image with the detected pose landmarks drawn and pose label written.
         label: The classified pose label of the person in the output_image.
-
     '''
 
     # Initialize the label of the pose. It is not known at this stage.
@@ -103,67 +102,61 @@ def classifyPose(landmarks, output_image, display=False):
                                       landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value])
 
     #----------------------------------------------------------------------------------------------------------------
-     # Check for Five-Pointed Star Pose
+    # Check for more specific poses first
+    # Check for Five-Pointed Star Pose
     if abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y - landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].y) < 100 and \
        abs(landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].y - landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].y) < 100 and \
        abs(landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].x) > 200 and \
        abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x) > 200:
         label = "Five-Pointed Star Pose"  
-    
+
+    # Check for Hands Under Feet Pose
+    elif landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y > landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].y and \
+       landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].y > landmarks[mp_pose.PoseLandmark.RIGHT_KNEE.value].y and \
+       abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].x) < 50 and \
+       abs(landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].x) < 50:
+        label = "Hands Under Feet Pose"
+
     # Check if it is the warrior II pose or the T pose.
-    if left_elbow_angle > 165 and left_elbow_angle < 195 and right_elbow_angle > 165 and right_elbow_angle < 195:
+    elif left_elbow_angle > 165 and left_elbow_angle < 195 and right_elbow_angle > 165 and right_elbow_angle < 195:
         if left_shoulder_angle > 80 and left_shoulder_angle < 110 and right_shoulder_angle > 80 and right_shoulder_angle < 110:
-            if left_knee_angle > 165 and left_knee_angle < 195 or right_knee_angle > 165 and right_knee_angle < 195:
-                if left_knee_angle > 90 and left_knee_angle < 120 or right_knee_angle > 90 and right_knee_angle < 120:
-                    label = 'Warrior II Pose'
-            if left_knee_angle > 160 and left_knee_angle < 195 and right_knee_angle > 160 and right_knee_angle < 195:
+            if left_knee_angle > 90 and left_knee_angle < 120 or right_knee_angle > 90 and right_knee_angle < 120:
+                label = 'Warrior II Pose'
+            elif left_knee_angle > 160 and left_knee_angle < 195 and right_knee_angle > 160 and right_knee_angle < 195:
                 label = 'T Pose'
     
     # Check if it is the tree pose.
-    if left_knee_angle > 165 and left_knee_angle < 195 or right_knee_angle > 165 and right_knee_angle < 195:
+    elif left_knee_angle > 165 and left_knee_angle < 195 or right_knee_angle > 165 and right_knee_angle < 195:
         if left_knee_angle > 315 and left_knee_angle < 335 or right_knee_angle > 25 and right_knee_angle < 45:
             label = 'Tree Pose'
 
     # Check for Upward Salute Pose
-    if abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].x) < 100 and \
+    elif abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.LEFT_HIP.value].x) < 100 and \
        abs(landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_HIP.value].x) < 100 and \
        landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y < landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y and \
        landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].y < landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].y and \
        abs(landmarks[mp_pose.PoseLandmark.LEFT_SHOULDER.value].y - landmarks[mp_pose.PoseLandmark.RIGHT_SHOULDER.value].y) < 50:
         label = "Upward Salute Pose"
-
-    # Check for Hands Under Feet Pose
-    if landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].y > landmarks[mp_pose.PoseLandmark.LEFT_KNEE.value].y and \
-       landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].y > landmarks[mp_pose.PoseLandmark.RIGHT_KNEE.value].y and \
-       abs(landmarks[mp_pose.PoseLandmark.LEFT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.LEFT_ANKLE.value].x) < 50 and \
-       abs(landmarks[mp_pose.PoseLandmark.RIGHT_WRIST.value].x - landmarks[mp_pose.PoseLandmark.RIGHT_ANKLE.value].x) < 50:
-        label = "Hands Under Feet Pose"       
-        
        
     #----------------------------------------------------------------------------------------------------------------
 
     # Check if the pose is classified successfully
     if label != 'Unknown Pose':
-
         # Update the color (to green) with which the label will be written on the image.
         color = (0, 255, 0)
 
     # Write the label on the output image.
-    cv2.putText(output_image, label, (220, 30),cv2.FONT_HERSHEY_PLAIN, 2, color, 2)
+    cv2.putText(output_image, label, (220, 30), cv2.FONT_HERSHEY_PLAIN, 2, color, 2)
 
     # Check if the resultant image is specified to be displayed.
     if display:
-
         # Display the resultant image.
         plt.figure(figsize=[10,10])
-        plt.imshow(output_image[:,:,::-1]);plt.title("Output Image");plt.axis('off');
-
+        plt.imshow(output_image[:,:,::-1]); plt.title("Output Image"); plt.axis('off')
     else:
-
         # Return the output image and the classified label.
         return output_image, label
 
-
 def run(
     image: np.ndarray,
     model_complexity: int,