Update calculations.py

calculations.py

@@ -46,31 +46,31 @@ def measure_body_sizes(side_colored_mask, front_colored_mask, sideposes, frontpo
             pixel_height, real_height_cm
         )
 
-        # arm_length_cm = convert_to_real_measurements(
-        #     euclidean_distance((right_shoulder.x, right_shoulder.y), (right_elbow.x, right_elbow.y)),
-        #     pixel_height, real_height_cm
-        # ) + convert_to_real_measurements(
-        #     euclidean_distance((right_elbow.x, right_elbow.y), (right_wrist.x, right_wrist.y)),
-        #     pixel_height, real_height_cm
-        # )
-        
-        # leg_length_cm = convert_to_real_measurements(
-        #     euclidean_distance((left_hip.x, left_hip.y), (left_knee.x, left_knee.y)),
-        #     pixel_height, real_height_cm
-        # ) + convert_to_real_measurements(
-        #     euclidean_distance((left_knee.x, left_knee.y), (left_ankle.x, left_ankle.y)),
-        #     pixel_height, real_height_cm
-        # )
-        
         arm_length_cm = convert_to_real_measurements(
-            euclidean_distance((left_shoulder.x, left_shoulder.y), (left_wrist.x, left_wrist.y)),
+            euclidean_distance((right_shoulder.x, right_shoulder.y), (right_elbow.x, right_elbow.y)),
             pixel_height, real_height_cm
-        ) 
+        ) + convert_to_real_measurements(
+            euclidean_distance((right_elbow.x, right_elbow.y), (right_wrist.x, right_wrist.y)),
+            pixel_height, real_height_cm
+        )
         
         leg_length_cm = convert_to_real_measurements(
-            euclidean_distance((left_hip.x, left_hip.y), (left_ankle.x, right_ankle.y)),
+            euclidean_distance((left_hip.x, left_hip.y), (left_knee.x, left_knee.y)),
+            pixel_height, real_height_cm
+        ) + convert_to_real_measurements(
+            euclidean_distance((left_knee.x, left_knee.y), (left_ankle.x, left_ankle.y)),
             pixel_height, real_height_cm
         )
+        
+        # arm_length_cm = convert_to_real_measurements(
+        #     euclidean_distance((left_shoulder.x, left_shoulder.y), (left_wrist.x, left_wrist.y)),
+        #     pixel_height, real_height_cm
+        # ) 
+        
+        # leg_length_cm = convert_to_real_measurements(
+        #     euclidean_distance((left_hip.x, left_hip.y), (left_ankle.x, right_ankle.y)),
+        #     pixel_height, real_height_cm
+        # )
 
         shoulder_to_waist_cm = convert_to_real_measurements(
             euclidean_distance((left_shoulder.x, left_shoulder.y), (left_hip.x, left_hip.y)),
@@ -78,21 +78,27 @@ def measure_body_sizes(side_colored_mask, front_colored_mask, sideposes, frontpo
         )
 
         # Calculate waist circumference using the ellipse circumference formula
+ # Calculate waist circumference using the ellipse circumference formula
         a = euclidean_distance((left_hip.x, left_hip.y), (right_hip.x, right_hip.y)) / 2
-        # b = euclidean_distance((), ()) / 2
+
+        # The semi-minor axis (b) can be estimated using a vertical distance, such as from the left hip to the left shoulder
+        b = euclidean_distance((left_hip.x, left_hip.y), (left_shoulder.x, left_shoulder.y)) / 2
 
         # Use Ramanujan's approximation for the circumference of an ellipse
-        # waist_circumference_px = math.pi * (3*(a + b) - math.sqrt((3*a + b)*(a + 3*b)))
-        waist_circumference_cm = 90 #convert_to_real_measurements(waist_circumference_px, pixel_height, real_height_cm)
+        waist_circumference_px = math.pi * (3 * (a + b) - math.sqrt((3 * a + b) * (a + 3 * b)))
+
+        # Convert the waist circumference from pixel measurements to real measurements
+        waist_circumference_cm = convert_to_real_measurements(waist_circumference_px, pixel_height, real_height_cm)
+
 
         
         # Convert pixel measurements to real measurements using the height ratio
         measurements.append({
-            "shoulder_width_cm": shoulder_width_cm,
-            "leg_length_cm": leg_length_cm,
+            "height_cm": real_height_cm,
             "arm_length_cm":  arm_length_cm,
+            "shoulder_width_cm": shoulder_width_cm,
             "shoulder_to_waist_cm": shoulder_to_waist_cm,
-            "height_cm": real_height_cm,
+            "leg_length_cm": leg_length_cm,
             "waist_circumference_cm": waist_circumference_cm
         })