update

app.py

@@ -115,6 +115,20 @@ def get_points_from_contours(contours):
 #     # Display the image with the selected quadrilateral
 #     display_image_with_quadrilateral(base_image, quad_points)
 
+def increment_index():
+    st.session_state.selected_quad_index = (st.session_state.selected_quad_index + 1) % len(st.session_state.valid_quadrilaterals)
+    st.session_state.centroids = update_displayed_quadrilateral(st.session_state.selected_quad_index)
+
+def decrement_index():
+    st.session_state.selected_quad_index = (st.session_state.selected_quad_index - 1) % len(st.session_state.valid_quadrilaterals)
+    st.session_state.centroids = update_displayed_quadrilateral(st.session_state.selected_quad_index)
+
+# Function to update displayed quadrilateral based on selected index
+def update_displayed_quadrilateral(valid_quadrilaterals, index):
+    # Extract the four points of the current quadrilateral
+    centroids = get_points_from_contours(valid_quadrilaterals[index])
+    return centroids
+    
 def get_centroid(contour):
     # Compute the centroid for the contour
     M = cv2.moments(contour)
@@ -164,6 +178,14 @@ def warp_and_display_images(img, centroids, base_name, flag_mask_rgb, plant_mask
     return plant_rgb, plot_rgb, plant_rgb_warp, plant_mask_warp
 
 def process_image(image_path, flag_lower, flag_upper, plant_lower, plant_upper, loc):
+    # Ensure session_state variables are initialized
+    if 'valid_quadrilaterals' not in st.session_state:
+        st.session_state.valid_quadrilaterals = [perm for perm in itertools.permutations(significant_contours, 4) if is_valid_quadrilateral(get_points_from_contours(perm))]
+    if 'selected_quad_index' not in st.session_state:
+        st.session_state.selected_quad_index = 0
+    if 'centroids' not in st.session_state:
+        st.session_state.centroids = get_points_from_contours(st.session_state.valid_quadrilaterals[0])
+
     with loc:
         btn_back, btn_next = st.columns([2,2])
 
@@ -222,26 +244,21 @@ def process_image(image_path, flag_lower, flag_upper, plant_lower, plant_upper,
         
         # Initial quadrilateral index
         st.session_state['selected_quad_index'] = 0
-        centroids = get_points_from_contours(valid_quadrilaterals[st.session_state['selected_quad_index']])
-        # Function to update displayed quadrilateral based on selected index
-        def update_displayed_quadrilateral(index):
-            # Extract the four points of the current quadrilateral
-            centroids = get_points_from_contours(valid_quadrilaterals[index])
-            return centroids
+        st.session_state.centroids = get_points_from_contours(valid_quadrilaterals[st.session_state['selected_quad_index']])
+        
 
         # Show initial quadrilateral
-        centroids = update_displayed_quadrilateral(st.session_state['selected_quad_index'])
+        st.session_state.centroids = update_displayed_quadrilateral(st.session_state['selected_quad_index'])
 
         with btn_back:
             if st.button('Previous'):
-                st.session_state['selected_quad_index'] = max(st.session_state['selected_quad_index'] - 1, 0)
-                update_displayed_quadrilateral(st.session_state['selected_quad_index'])
+                decrement_index()  # Call function to decrement index
+
         with btn_next:
             if st.button('Next'):
-                st.session_state['selected_quad_index'] = min(st.session_state['selected_quad_index'] + 1, len(valid_quadrilaterals) - 1)
-                update_displayed_quadrilateral(st.session_state['selected_quad_index'])
+                increment_index()
 
-    poly_mask = create_polygon_mask(centroids, flag_mask.shape)
+    poly_mask = create_polygon_mask(st.session_state.centroids, flag_mask.shape)
 
     # Mask the plant_mask with poly_mask
     mask_plant_plot = cv2.bitwise_and(plant_mask, plant_mask, mask=poly_mask)
@@ -257,7 +274,7 @@ def process_image(image_path, flag_lower, flag_upper, plant_lower, plant_upper,
     # Draw the bounding quadrilateral
     plot_rgb = plant_rgb.copy()
     for i in range(4):
-        cv2.line(plot_rgb, centroids[i], centroids[(i+1)%4], (0, 0, 255), 3)
+        cv2.line(plot_rgb, st.session_state.centroids[i], st.session_state.centroids[(i+1)%4], (0, 0, 255), 3)
 
     # Convert the masks to RGB for visualization
     flag_mask_rgb = cv2.cvtColor(flag_mask, cv2.COLOR_GRAY2RGB)
@@ -271,8 +288,8 @@ def process_image(image_path, flag_lower, flag_upper, plant_lower, plant_upper,
     mask_plant_plot_rgb[np.any(mask_plant_plot_rgb != [0, 0, 0], axis=-1)] = bright_green_color
     
     # Warp the images
-    plant_rgb_warp = warp_image(plant_rgb, centroids)
-    plant_mask_warp = warp_image(mask_plant_plot_rgb, centroids)
+    plant_rgb_warp = warp_image(plant_rgb, st.session_state.centroids)
+    plant_mask_warp = warp_image(mask_plant_plot_rgb, st.session_state.centroids)
 
     return flag_mask_rgb, plant_mask_rgb, mask_plant_plot_rgb, plant_rgb, plot_rgb, plant_rgb_warp, plant_mask_warp, plant_mask, mask_plant_plot, black_pixels_in_quad