nec c

comic_panel_extractor/panel_extractor.py

@@ -6,6 +6,7 @@ import cv2
 from dataclasses import dataclass
 import os
 import re
+from .utils import remove_duplicate_boxes
 
 @dataclass
 class PanelData:
@@ -247,22 +248,14 @@ class PanelExtractor:
                 coords.append(tuple(map(int, match.groups())))
         return coords
 
-    def is_fully_contained(self, x1: int, y1: int, x2: int, y2: int,
-                       boxes: List[Tuple[int, int, int, int]],
-                       threshold: int = 200) -> bool:
-        for ex1, ey1, ex2, ey2 in boxes:
-            # Case 1: Fully contained
-            if x1 >= ex1 and y1 >= ey1 and x2 <= ex2 and y2 <= ey2:
-                return True
+    def count_panels_inside(self, target_box, other_boxes):
+        x1a, y1a, x2a, y2a = target_box
+        count = 0
+        for x1b, y1b, x2b, y2b in other_boxes:
+            if x1a <= x1b and y1a <= y1b and x2a >= x2b and y2a >= y2b:
+                count += 1
+        return count
 
-            # Case 2: Near containment (within threshold)
-            if (
-                x1 >= ex1 - threshold and y1 >= ey1 - threshold and
-                x2 <= ex2 + threshold and y2 <= ey2 + threshold
-            ):
-                return True
-
-        return False
 
     def _save_panels(self, panels: List[Tuple[int, int, int, int]], original: np.ndarray, width: int, height: int) -> Tuple[List[np.ndarray], List[PanelData], List[str]]:
         """Save panel images and return panel data."""
@@ -310,10 +303,18 @@ class PanelExtractor:
             # Check for full containment in existing and current session
             already_saved_coords = existing_coords + [ (pd.x_start, pd.y_start, pd.x_end, pd.y_end) for pd in panel_data ]
 
-            if self.is_fully_contained(x1, y1, x2, y2, already_saved_coords):
+            # 1. Skip if duplicate
+            is_duplicate, _ = remove_duplicate_boxes(already_saved_coords, (x1, y1, x2, y2))
+            if is_duplicate:
                 print(f"⚠️ Skipping panel #{idx} — fully contained in existing panel")
                 continue
 
+            # 2. Skip if this panel contains ≥1 other panels
+            contained_count = self.count_panels_inside((x1, y1, x2, y2), already_saved_coords)
+            if contained_count >= 1:
+                print(f"⚠️ Skipping panel #{idx} — contains {contained_count} other panels inside")
+                continue
+
             # Save panel
             panel_img = visual_output[y1:y2, x1:x2]
             panel_images.append(panel_img)