Update app.py

app.py

@@ -59,7 +59,7 @@ def detect_circles(frame_diff, image_center, center_tolerance, param1, param2, m
     return None
 
 def analyze_gif(gif_file, lower_bound, upper_bound, param1, param2, center_tolerance, morph_iterations):
-    """Analyze a GIF for growing concentric circles of mid-to-light pixels."""
+    """Analyze a GIF for concentric circles, highlighting growing series."""
     try:
         # Handle Gradio file input
         gif_path = gif_file.name if hasattr(gif_file, 'name') else gif_file
@@ -105,33 +105,59 @@ def analyze_gif(gif_file, lower_bound, upper_bound, param1, param2, center_toler
                     "output_frame": frames[i + 1]  # Store the frame for visualization
                 })
 
-        # Filter frames where the circle is growing
+        # Find the longest series of frames where the circle is growing
         growing_circle_data = []
+        current_series = []
         if all_circle_data:
-            # Start with the first detection
-            growing_circle_data.append(all_circle_data[0])
+            current_series.append(all_circle_data[0])
             for i in range(1, len(all_circle_data)):
-                # Compare radius with the last growing circle
-                if all_circle_data[i]["radius"] > growing_circle_data[-1]["radius"]:
-                    growing_circle_data.append(all_circle_data[i])
+                if all_circle_data[i]["radius"] > current_series[-1]["radius"]:
+                    current_series.append(all_circle_data[i])
+                else:
+                    # If the radius doesn't increase, check if the current series is the longest
+                    if len(current_series) > len(growing_circle_data):
+                        growing_circle_data = current_series.copy()
+                    current_series = [all_circle_data[i]]
+
+            # Check the last series
+            if len(current_series) > len(growing_circle_data):
+                growing_circle_data = current_series.copy()
+
+        # Mark frames that are part of the growing series
+        growing_frames = set(c["frame"] for c in growing_circle_data)
 
         # Generate output frames and report
         results = []
-        report = "Analysis Report (as of 07:44 PM PDT, May 24, 2025):\n"
-        if growing_circle_data:
-            report += f"Detected {len(growing_circle_data)} frames with growing concentric circles of mid-to-light pixels:\n"
-            for c in growing_circle_data:
-                # Visualize the frame with detected circle
+        report = "Analysis Report (as of 08:07 PM PDT, May 24, 2025):\n"
+        
+        # Report all detected circles
+        if all_circle_data:
+            report += f"\nAll Frames with Detected Circles ({len(all_circle_data)} frames):\n"
+            for c in all_circle_data:
+                # Visualize the frame with detected circle (green)
                 output_frame = cv2.cvtColor(c["output_frame"], cv2.COLOR_GRAY2RGB)
                 cv2.circle(output_frame, (c["center"][0], c["center"][1]), c["radius"], (0, 255, 0), 2)
+
+                # If the frame is part of the growing series, add a red circle
+                if c["frame"] in growing_frames:
+                    cv2.circle(output_frame, (c["center"][0], c["center"][1]), c["radius"] + 2, (255, 0, 0), 2)
+
                 # Convert to PIL Image for Gradio
                 output_frame = Image.fromarray(output_frame)
                 results.append(output_frame)
 
+                report += f"Frame {c['frame']}: Center at {c['center']}, Radius {c['radius']} pixels\n"
+        else:
+            report += "No circles detected.\n"
+
+        # Report the growing series
+        if growing_circle_data:
+            report += f"\nSeries of Frames with Growing Circles ({len(growing_circle_data)} frames):\n"
+            for c in growing_circle_data:
                 report += f"Frame {c['frame']}: Center at {c['center']}, Radius {c['radius']} pixels\n"
             report += "\nConclusion: Growing concentric circles of mid-to-light pixels detected, indicative of a potential Earth-directed CME."
         else:
-            report += "No growing concentric circles of mid-to-light pixels detected. CME may not be Earth-directed."
+            report += "\nNo growing concentric circles detected. CME may not be Earth-directed."
 
         return report, results
     except Exception as e:
@@ -151,10 +177,10 @@ iface = gr.Interface(
     ],
     outputs=[
         gr.Textbox(label="Analysis Report"),
-        gr.Gallery(label="Frames with Growing Circles")
+        gr.Gallery(label="Frames with Detected Circles (Green: Detected, Red: Growing Series)")
     ],
     title="Solar CME Detection",
-    description="Upload a GIF of solar images to detect growing concentric circles of mid-to-light pixels indicative of Earth-directed coronal mass ejections (CMEs). Adjust the sliders to fine-tune detection."
+    description="Upload a GIF of solar images to detect concentric circles of mid-to-light pixels. All detected circles are shown in green, and the series of growing circles (indicating an Earth-directed CME) are highlighted in red. Adjust the sliders to fine-tune detection."
 )
 
 if __name__ == "__main__":