Update app.py

app.py

@@ -8,7 +8,7 @@ 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
+from services.crack_detection_service import detect_cracks_and_objects
 from services.overlay_service import overlay_boxes
 from services.metrics_service import update_metrics
 from services.map_service import generate_map
@@ -16,7 +16,7 @@ from services.utils import simulate_gps_coordinates
 
 # Globals
 paused = False
-frame_rate = 1
+frame_rate = 0.5
 frame_count = 0
 log_entries = []
 crack_counts = []
@@ -31,11 +31,19 @@ gps_coordinates = []
 TEMP_IMAGE_PATH = "temp.jpg"
 CAPTURED_FRAMES_DIR = "captured_frames"
 os.makedirs(CAPTURED_FRAMES_DIR, exist_ok=True)
-MAX_GALLERY_IMAGES = 100  # Increased to store up to 100 images
+
+# Custom Gradio theme
+custom_theme = gr.themes.Soft(
+    primary_hue="red",
+    secondary_hue="green",
+    neutral_hue="black",
+    text_size="lg",
+    radius_size="lg",
+)
 
 # 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
 
     if paused and last_frame is not None:
         frame = last_frame.copy()
@@ -47,36 +55,32 @@ 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_boxes = detect_cracks(frame)
-        frame = overlay_boxes(frame, detected_boxes)
+        detected_items = detect_cracks_and_objects(frame)
+        frame = overlay_boxes(frame, detected_items)
         cv2.imwrite(TEMP_IMAGE_PATH, frame, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
-        metrics = update_metrics(detected_boxes)
+        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_coordinates.append(gps_coord)
 
-        if detected_boxes:
-            captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"crack_{frame_count}.jpg")
+        if detected_items:
+            captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"frame_{frame_count}.jpg")
             cv2.imwrite(captured_frame_path, frame)
             last_detected_images.append(captured_frame_path)
-            if len(last_detected_images) > MAX_GALLERY_IMAGES:
-                oldest_image = last_detected_images.pop(0)
-                try:
-                    os.remove(oldest_image)
-                except:
-                    pass  # Ignore if file can't be deleted
+            if len(last_detected_images) > 100:
+                last_detected_images.pop(0)
 
         last_frame = frame.copy()
         last_metrics = metrics.copy()
 
         # Update logs and stats
-        crack_detected = len(last_metrics.get('cracks', []))
+        crack_detected = len([item for item in last_metrics.get('items', []) if item['type'] == 'crack'])
         crack_severity_all.extend([
-            a['severity']
-            for a in last_metrics.get('cracks', [])
-            if isinstance(a, dict) and 'severity' in a
+            item['severity']
+            for item in last_metrics.get('items', [])
+            if item['type'] == 'crack' and 'severity' in item
         ])
 
         log_entries.append(f"{last_timestamp} - Frame {frame_count} - Cracks: {crack_detected} - GPS: {gps_coord}")
@@ -89,11 +93,11 @@ def monitor_feed():
         if len(crack_severity_all) > 500:
             crack_severity_all.pop(0)
 
-    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)
+    frame = cv2.resize(last_frame, (800, 600))
+    cv2.putText(frame, f"Frame: {frame_count}", (20, 40), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), 2)
+    cv2.putText(frame, f"{last_timestamp}", (20, 80), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), 2)
 
-    map_path = generate_map(gps_coordinates[-5:], last_metrics.get('cracks', []))
+    map_path = generate_map(gps_coordinates[-5:], last_metrics.get('items', []))
 
     return frame[:, :, ::-1], last_metrics, "\n".join(log_entries[-10:]), generate_line_chart(), generate_pie_chart(), last_detected_images, map_path
 
@@ -101,14 +105,15 @@ def monitor_feed():
 def generate_line_chart():
     if not crack_counts:
         return None
-    fig, ax = plt.subplots(figsize=(4, 2))
-    ax.plot(crack_counts[-50:], marker='o')
-    ax.set_title("Cracks Over Time")
-    ax.set_xlabel("Frame")
-    ax.set_ylabel("Count")
+    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.tight_layout()
     chart_path = "chart_temp.png"
-    fig.savefig(chart_path)
+    fig.savefig(chart_path, bbox_inches='tight')
     plt.close(fig)
     return chart_path
 
@@ -116,42 +121,43 @@ def generate_line_chart():
 def generate_pie_chart():
     if not crack_severity_all:
         return None
-    fig, ax = plt.subplots(figsize=(4, 2))
+    fig, ax = plt.subplots(figsize=(6, 3))
     count = Counter(crack_severity_all[-200:])
     labels, sizes = zip(*count.items())
-    ax.pie(sizes, labels=labels, autopct='%1.1f%%', startangle=140)
+    colors = ['red', 'orange', 'green']
+    ax.pie(sizes, labels=labels, colors=colors, autopct='%1.1f%%', startangle=140, textprops={'fontsize': 12, 'color': 'black'})
     ax.axis('equal')
     fig.tight_layout()
     pie_path = "pie_temp.png"
-    fig.savefig(pie_path)
+    fig.savefig(pie_path, bbox_inches='tight')
     plt.close(fig)
     return pie_path
 
 # Gradio UI
-with gr.Blocks(theme=gr.themes.Soft()) as app:
-    gr.Markdown("# 🛡️ Drone Road Inspection Dashboard")
-
-    status_text = gr.Markdown("**Status:** 🟢 Running")
+with gr.Blocks(theme=custom_theme) as app:
+    gr.Markdown("# 🛣️ Drone Road Inspection Dashboard", _js="document.body.style.backgroundColor = '#f0f0f0';")
+    
+    status_text = gr.Markdown("**Status:** 🟢 Running", elem_classes="status-text")
 
     with gr.Row():
         with gr.Column(scale=3):
-            video_output = gr.Image(label="Live Drone Feed", width=640, height=480)
-        with gr.Column(scale=1):
-            metrics_output = gr.Textbox(label="Crack Metrics", lines=4)
+            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")
 
     with gr.Row():
-        logs_output = gr.Textbox(label="Live Logs", lines=8)
-        chart_output = gr.Image(label="Crack Trend")
-        pie_output = gr.Image(label="Crack Severity")
+        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)
 
     with gr.Row():
-        map_output = gr.Image(label="Crack Locations Map")
-        captured_images = gr.Gallery(label=f"Detected Cracks (Last {MAX_GALLERY_IMAGES})", elem_id="gallery", columns=5, object_fit="contain", height="auto")
+        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")
 
     with gr.Row():
-        pause_btn = gr.Button("⏸️ Pause")
-        resume_btn = gr.Button("▶️ Resume")
-        frame_slider = gr.Slider(0.0005, 5, value=1, label="Frame Interval (seconds)")
+        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")
 
     def toggle_pause():
         global paused