Update app.py

app.py

@@ -26,7 +26,8 @@ crack_severity_all = []
 last_frame = None
 last_metrics = {}
 last_timestamp = ""
-last_detected_images = []  # Store up to 100+ crack/hole images
+last_detected_cracks = []  # Store up to 100+ crack images
+last_detected_holes = []   # Store up to 100+ hole images
 gps_coordinates = []
 
 # Constants
@@ -36,7 +37,7 @@ os.makedirs(CAPTURED_FRAMES_DIR, exist_ok=True)
 
 # Core monitor function
 def monitor_feed():
-    global paused, frame_count, last_frame, last_metrics, last_timestamp, gps_coordinates, last_detected_images
+    global paused, frame_count, last_frame, last_metrics, last_timestamp, gps_coordinates, last_detected_cracks, last_detected_holes
 
     if paused and last_frame is not None:
         frame = last_frame.copy()
@@ -46,7 +47,7 @@ def monitor_feed():
             frame = get_next_video_frame()
         except RuntimeError as e:
             log_entries.append(f"Error: {str(e)}")
-            return None, last_metrics, "\n".join(log_entries[-10:]), None, None, last_detected_images, None
+            return None, last_metrics, "\n".join(log_entries[-10:]), None, None, last_detected_cracks, last_detected_holes, None
 
         detected_items = detect_cracks_and_holes(frame)  # Includes cracks and holes
         frame = overlay_boxes(frame, detected_items)
@@ -58,12 +59,19 @@ def monitor_feed():
         gps_coord = [17.385044 + random.uniform(-0.001, 0.001), 78.486671 + frame_count * 0.0001]
         gps_coordinates.append(gps_coord)
 
-        if any(item['type'] in ['crack', 'hole'] for item in detected_items):
+        # Save detected cracks and holes separately
+        if detected_items:
             captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"detected_{frame_count}.jpg")
             cv2.imwrite(captured_frame_path, frame)
-            last_detected_images.append(captured_frame_path)
-            if len(last_detected_images) > 100:  # Store up to 100 images
-                last_detected_images.pop(0)
+            for item in detected_items:
+                if item['type'] == 'crack':
+                    last_detected_cracks.append(captured_frame_path)
+                    if len(last_detected_cracks) > 100:
+                        last_detected_cracks.pop(0)
+                elif item['type'] == 'hole':
+                    last_detected_holes.append(captured_frame_path)
+                    if len(last_detected_holes) > 100:
+                        last_detected_holes.pop(0)
 
         last_frame = frame.copy()
         last_metrics = metrics.copy()
@@ -93,7 +101,7 @@ def monitor_feed():
 
     map_path = generate_map(gps_coordinates[-5:], [item for item in last_metrics.get('items', []) if item['type'] in ['crack', 'hole']])
 
-    return frame[:, :, ::-1], last_metrics, "\n".join(log_entries[-10:]), generate_line_chart(), generate_pie_chart(), last_detected_images, map_path
+    return frame[:, :, ::-1], last_metrics, "\n".join(log_entries[-10:]), generate_line_chart(), generate_pie_chart(), last_detected_cracks, last_detected_holes, map_path
 
 # Line chart
 def generate_line_chart():
@@ -144,7 +152,9 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
 
     with gr.Row():
         map_output = gr.Image(label="Crack/Hole Locations Map")
-        captured_images = gr.Gallery(label="Detected Cracks/Holes (Last 100+)", columns=4, rows=25)
+        with gr.Column():
+            crack_images = gr.Gallery(label="Detected Cracks (Last 100+)", columns=4, rows=13)
+            hole_images = gr.Gallery(label="Detected Holes (Last 100+)", columns=4, rows=13)
 
     with gr.Row():
         pause_btn = gr.Button("⏸️ Pause")
@@ -171,14 +181,14 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
 
     def streaming_loop():
         while True:
-            frame, metrics, logs, chart, pie, captured, map_path = monitor_feed()
+            frame, metrics, logs, chart, pie, cracks, holes, map_path = monitor_feed()
             if frame is None:
-                yield None, str(metrics), logs, chart, pie, captured, map_path
+                yield None, str(metrics), logs, chart, pie, cracks, holes, map_path
             else:
-                yield frame, str(metrics), logs, chart, pie, captured, map_path
+                yield frame, str(metrics), logs, chart, pie, cracks, holes, map_path
             time.sleep(frame_rate)
 
-    app.load(streaming_loop, outputs=[video_output, metrics_output, logs_output, chart_output, pie_output, captured_images, map_output])
+    app.load(streaming_loop, outputs=[video_output, metrics_output, logs_output, chart_output, pie_output, crack_images, hole_images, map_output])
 
 if __name__ == "__main__":
     app.launch(share=True)