update

app.py

@@ -115,6 +115,29 @@ def update_displayed_quadrilateral(index, point_combinations, base_image_path):
     # Display the image with the selected quadrilateral
     display_image_with_quadrilateral(base_image, quad_points)
 
+def quadrilateral_area(centroids):
+    # Assuming centroids are in correct order (A, B, C, D) to form a quadrilateral
+    def distance(p1, p2):
+        return math.sqrt((p1[0] - p2[0]) ** 2 + (p1[1] - p2[1]) ** 2)
+    
+    A, B, C, D = centroids
+    # Using Bretschneider's formula to calculate area of a quadrilateral
+    a = distance(A, B)
+    b = distance(B, C)
+    c = distance(C, D)
+    d = distance(D, A)
+    p = (a + b + c + d) / 2  # semi-perimeter
+    return math.sqrt((p - a) * (p - b) * (p - c) * (p - d))
+
+def sort_permutations_by_area(valid_permutations):
+    # Calculate area for each permutation and return sorted list
+    perm_areas = [(perm, quadrilateral_area(get_points_from_contours(perm))) for perm in valid_permutations]
+    # Sort by area in descending order (largest first)
+    perm_areas.sort(key=lambda x: x[1], reverse=True)
+    # Return only the sorted permutations, not the areas
+    sorted_permutations = [perm for perm, area in perm_areas]
+    return sorted_permutations
+
 def is_valid_quadrilateral(centroids):
     if len(centroids) != 4:
         return False
@@ -185,7 +208,9 @@ def process_image(image_path, flag_lower, flag_upper, plant_lower, plant_upper,
             permutations_of_four = list(itertools.permutations(significant_contours, 4))
 
             # Filter out invalid quadrilaterals
-            valid_permutations = [perm for perm in permutations_of_four if is_valid_quadrilateral(get_points_from_contours(perm))]
+            valid_permutations0 = [perm for perm in permutations_of_four if is_valid_quadrilateral(get_points_from_contours(perm))]
+
+            valid_permutations = sort_permutations_by_area(valid_permutations0)
 
             if not valid_permutations:
                 st.error("No valid quadrilaterals found.")
@@ -508,6 +533,7 @@ def main():
                     st.image(plant_rgb_warp, caption="Plant Mask Inside Plot Warped to Square", use_column_width=True)
                     # st.image(plot_rgb_warp, caption="Flag Mask", use_column_width=True)
                 with R_save:
+                    st.write(f"Showing plot outline #{st.session_state.quad_index}")
                     if st.button('Save'):
                         # Save the masks to their respective folders
                         save_img(directory_manager.mask_flag, base_name, flag_mask)