Update utils.py

utils.py

@@ -238,28 +238,22 @@ def intersects(rectA, rectB):
 def is_there_a_directed_edge(a, b, rects):
     rectA = rects[a]
     rectB = rects[b]
-    centre_of_A = [rectA[0] + (rectA[2] - rectA[0]) / 2, rectA[1] + (rectA[3] - rectA[1]) / 2]
-    centre_of_B = [rectB[0] + (rectB[2] - rectB[0]) / 2, rectB[1] + (rectB[3] - rectB[1]) / 2]
-    if np.allclose(np.array(centre_of_A), np.array(centre_of_B)):
-        return box(*rectA).area > (box(*rectB)).area
-    copy_A = [rectA[0], rectA[1], rectA[2], rectA[3]]
-    copy_B = [rectB[0], rectB[1], rectB[2], rectB[3]]
-    while True:
-        if is_strictly_above(copy_A, copy_B) and not is_strictly_left_of(copy_A, copy_B):
-            return 1
-        if is_strictly_above(copy_B, copy_A) and not is_strictly_left_of(copy_B, copy_A):
-            return 0
-        if is_strictly_right_of(copy_A, copy_B) and not is_strictly_below(copy_A, copy_B):
-            return 1
-        if is_strictly_right_of(copy_B, copy_A) and not is_strictly_below(copy_B, copy_A):
-            return 0
-        if is_strictly_below(copy_A, copy_B) and is_strictly_right_of(copy_A, copy_B):
-            return use_cuts_to_determine_edge_from_a_to_b(a, b, rects)
-        if is_strictly_below(copy_B, copy_A) and is_strictly_right_of(copy_B, copy_A):
-           return use_cuts_to_determine_edge_from_a_to_b(a, b, rects)
-        # otherwise they intersect
-        copy_A = erode_rectangle(copy_A, 0.05)
-        copy_B = erode_rectangle(copy_B, 0.05)
+    
+    # Check if rectA is to the left of rectB
+    if is_strictly_left_of(rectA, rectB):
+        return True
+    elif is_strictly_left_of(rectB, rectA):
+        return False
+    
+    # If overlapping on the x-axis, we'll perhaps rely on top-to-bottom
+    if is_strictly_above(rectA, rectB):
+        return True
+    elif is_strictly_below(rectA, rectB):
+        return False
+    
+    # If none of these strict conditions is met,
+    # fall back to checking if one intersects the other and using size (this may rarely happen)
+    return box(*rectA).area > box(*rectB).area
     
 def get_distance(rectA, rectB):
     return box(rectA[0], rectA[1], rectA[2], rectA[3]).distance(box(rectB[0], rectB[1], rectB[2], rectB[3]))
@@ -377,23 +371,10 @@ def get_text_to_panel_mapping(text_bboxes, sorted_panel_bboxes):
     return text_to_panel_mapping
 
 def sort_texts_within_panel(rects):
-    smallest_y = float("inf")
-    greatest_x = float("-inf")
-    for i, rect in enumerate(rects):
-        x1, y1, x2, y2 = rect
-        smallest_y = min(smallest_y, y1)
-        greatest_x = max(greatest_x, x2)
-    
-    reference_point = Point(greatest_x, smallest_y)
-
-    polygons_and_index = []
-    for i, rect in enumerate(rects):
-        x1, y1, x2, y2 = rect
-        polygons_and_index.append((box(x1,y1,x2,y2), i))
-    # sort points by closest to reference point
-    polygons_and_index = sorted(polygons_and_index, key=lambda x: reference_point.distance(x[0]))
-    indices = [x[1] for x in polygons_and_index]
-    return indices
+    # Sort primarily by the x-coordinate (left to right), then by y-coordinate if needed
+    rects_with_index = [(i, rect) for i, rect in enumerate(rects)]
+    sorted_rects = sorted(rects_with_index, key=lambda x: (x[1][0], x[1][1]))
+    return [x[0] for x in sorted_rects]
 
 def x1y1wh_to_x1y1x2y2(bbox):
     x1, y1, w, h = bbox