Update app.py

app.py

@@ -7,16 +7,18 @@ import matplotlib.pyplot as plt
 import numpy as np
 from datetime import datetime
 from collections import Counter
-from services.video_service import get_next_video_frame, reset_video_index
-from services.crack_detection_service import detect_cracks_and_objects
+from services.video_service import get_next_video_frame, reset_video_index, preload_video
+from services.crack_detection_service import detect_cracks_and_holes
 from services.overlay_service import overlay_boxes
 from services.metrics_service import update_metrics
 from services.map_service import generate_map
-from services.utils import simulate_gps_coordinates
+
+# Preload video to reduce startup time
+preload_video()
 
 # Globals
 paused = False
-frame_rate = 0.5
+frame_rate = 0.3  # Faster frame rate for quicker video reading
 frame_count = 0
 log_entries = []
 crack_counts = []
@@ -24,7 +26,7 @@ crack_severity_all = []
 last_frame = None
 last_metrics = {}
 last_timestamp = ""
-last_detected_images = []
+last_detected_images = []  # Store up to 100+ crack/hole images
 gps_coordinates = []
 
 # Constants
@@ -32,18 +34,9 @@ TEMP_IMAGE_PATH = "temp.jpg"
 CAPTURED_FRAMES_DIR = "captured_frames"
 os.makedirs(CAPTURED_FRAMES_DIR, exist_ok=True)
 
-# Custom Gradio theme
-custom_theme = gr.themes.Soft(
-    primary_hue="red",
-    secondary_hue="green",
-    neutral_hue="gray",
-    text_size="lg",
-    radius_size="lg",
-)
-
 # Core monitor function
 def monitor_feed():
-    global paused, frame_count, last_frame, last_metrics, last_timestamp, gps_coordinates
+    global paused, frame_count, last_frame, last_metrics, last_timestamp, gps_coordinates, last_detected_images
 
     if paused and last_frame is not None:
         frame = last_frame.copy()
@@ -55,21 +48,21 @@ def monitor_feed():
             log_entries.append(f"Error: {str(e)}")
             return None, last_metrics, "\n".join(log_entries[-10:]), None, None, last_detected_images, None
 
-        detected_items = detect_cracks_and_objects(frame)
+        detected_items = detect_cracks_and_holes(frame)  # Includes cracks and holes
         frame = overlay_boxes(frame, detected_items)
         cv2.imwrite(TEMP_IMAGE_PATH, frame, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
         metrics = update_metrics(detected_items)
 
         frame_count += 1
         last_timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        gps_coord = simulate_gps_coordinates(frame_count)
+        gps_coord = [17.385044 + random.uniform(-0.001, 0.001), 78.486671 + frame_count * 0.0001]
         gps_coordinates.append(gps_coord)
 
-        if detected_items:
-            captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"frame_{frame_count}.jpg")
+        if any(item['type'] in ['crack', 'hole'] for item in 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:
+            if len(last_detected_images) > 100:  # Store up to 100 images
                 last_detected_images.pop(0)
 
         last_frame = frame.copy()
@@ -77,14 +70,15 @@ def monitor_feed():
 
         # Update logs and stats
         crack_detected = len([item for item in last_metrics.get('items', []) if item['type'] == 'crack'])
+        hole_detected = len([item for item in last_metrics.get('items', []) if item['type'] == 'hole'])
         crack_severity_all.extend([
             item['severity']
             for item in last_metrics.get('items', [])
-            if item['type'] == 'crack' and 'severity' in item
+            if item['type'] in ['crack', 'hole'] and isinstance(item, dict) and 'severity' in item
         ])
 
-        log_entries.append(f"{last_timestamp} - Frame {frame_count} - Cracks: {crack_detected} - GPS: {gps_coord}")
-        crack_counts.append(crack_detected)
+        log_entries.append(f"{last_timestamp} - Frame {frame_count} - Cracks: {crack_detected} - Holes: {hole_detected} - GPS: {gps_coord}")
+        crack_counts.append(crack_detected + hole_detected)
 
         if len(log_entries) > 100:
             log_entries.pop(0)
@@ -93,11 +87,11 @@ def monitor_feed():
         if len(crack_severity_all) > 500:
             crack_severity_all.pop(0)
 
-    frame = cv2.resize(last_frame, (800, 600))
-    cv2.putText(frame, f"Frame: {frame_count}", (20, 40), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 0), 2)
-    cv2.putText(frame, f"{last_timestamp}", (20, 80), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 0), 2)
+    frame = cv2.resize(last_frame, (640, 480))
+    cv2.putText(frame, f"Frame: {frame_count}", (10, 25), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
+    cv2.putText(frame, f"{last_timestamp}", (10, 50), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
 
-    map_path = generate_map(gps_coordinates[-5:], last_metrics.get('items', []))
+    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
 
@@ -105,59 +99,57 @@ def monitor_feed():
 def generate_line_chart():
     if not crack_counts:
         return None
-    fig, ax = plt.subplots(figsize=(6, 3))
-    ax.plot(crack_counts[-50:], marker='o', color='orange')
-    ax.set_title("Cracks Over Time", color='black', fontsize=14)
-    ax.set_xlabel("Frame", color='black', fontsize=12)
-    ax.set_ylabel("Count", color='black', fontsize=12)
-    ax.grid(True, color='pink', linestyle='--', alpha=0.5)
+    fig, ax = plt.subplots(figsize=(4, 2))
+    ax.plot(crack_counts[-50:], marker='o')
+    ax.set_title("Cracks/Holes Over Time")
+    ax.set_xlabel("Frame")
+    ax.set_ylabel("Count")
     fig.tight_layout()
     chart_path = "chart_temp.png"
-    fig.savefig(chart_path, bbox_inches='tight')
+    fig.savefig(chart_path)
     plt.close(fig)
     return chart_path
 
-# Pie chart for crack severity
+# Pie chart for severity
 def generate_pie_chart():
     if not crack_severity_all:
         return None
-    fig, ax = plt.subplots(figsize=(6, 3))
+    fig, ax = plt.subplots(figsize=(4, 2))
     count = Counter(crack_severity_all[-200:])
     labels, sizes = zip(*count.items())
-    colors = ['red', 'orange', 'green']
-    ax.pie(sizes, labels=labels, colors=colors, autopct='%1.1f%%', startangle=140, textprops={'fontsize': 12, 'color': 'black'})
+    ax.pie(sizes, labels=labels, autopct='%1.1f%%', startangle=140)
     ax.axis('equal')
     fig.tight_layout()
     pie_path = "pie_temp.png"
-    fig.savefig(pie_path, bbox_inches='tight')
+    fig.savefig(pie_path)
     plt.close(fig)
     return pie_path
 
 # Gradio UI
-with gr.Blocks(theme=custom_theme, css="body {background-color: #f0f0f0 !important} .status-text {font-size: 18px !important; color: black !important} .video-feed {border: 2px solid red !important} .metrics-box {border: 2px solid green !important} .logs-box {border: 2px solid orange !important} .control-btn {font-size: 16px !important} .slider {width: 300px !important}") as app:
-    gr.Markdown("# 🛣️ Drone Road Inspection Dashboard")
-    
-    status_text = gr.Markdown("**Status:** 🟢 Running", elem_classes="status-text")
+with gr.Blocks(theme=gr.themes.Soft()) as app:
+    gr.Markdown("# 🛡️ Drone Road Inspection Dashboard")
+
+    status_text = gr.Markdown("**Status:** 🟢 Running")
 
     with gr.Row():
         with gr.Column(scale=3):
-            video_output = gr.Image(label="Live Drone Feed", width=800, height=600, elem_classes="video-feed")
-        with gr.Column(scale=2):
-            metrics_output = gr.Textbox(label="Crack & Object Metrics", lines=6, elem_classes="metrics-box")
+            video_output = gr.Image(label="Live Drone Feed", width=640, height=480)
+        with gr.Column(scale=1):
+            metrics_output = gr.Textbox(label="Crack/Hole Metrics", lines=4)
 
     with gr.Row():
-        logs_output = gr.Textbox(label="Live Logs", lines=10, elem_classes="logs-box")
-        chart_output = gr.Image(label="Crack Trend", width=400, height=200)
-        pie_output = gr.Image(label="Crack Severity", width=400, height=200)
+        logs_output = gr.Textbox(label="Live Logs", lines=8)
+        chart_output = gr.Image(label="Crack/Hole Trend")
+        pie_output = gr.Image(label="Severity Distribution")
 
     with gr.Row():
-        map_output = gr.Image(label="Crack & Object Locations Map", width=800, height=400)
-        captured_images = gr.Gallery(label="Detected Cracks & Objects (Last 100)", columns=5, height=600, object_fit="contain")
+        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.Row():
-        pause_btn = gr.Button("⏸️ Pause", variant="secondary", elem_classes="control-btn")
-        resume_btn = gr.Button("▶️ Resume", variant="primary", elem_classes="control-btn")
-        frame_slider = gr.Slider(0.1, 2, value=0.5, step=0.1, label="Frame Interval (seconds)", elem_classes="slider")
+        pause_btn = gr.Button("⏸️ Pause")
+        resume_btn = gr.Button("▶️ Resume")
+        frame_slider = gr.Slider(0.0005, 5, value=0.3, label="Frame Interval (seconds)")
 
     def toggle_pause():
         global paused