Update app.py

app.py

@@ -286,52 +286,36 @@ def polygon_to_exterior_coords(poly: Polygon):
         return []
     return list(poly.exterior.coords)
 
-def place_finger_cut_adjusted(
-    tool_polygon,
-    points_inch,
-    existing_centers,
-    all_polygons,
-    circle_diameter=1.0,
-    min_gap=0.25,
-    max_attempts=30
-):
+def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_polygons, circle_diameter=1.0, min_gap=0.25, max_attempts=30):
     import random
     needed_center_distance = circle_diameter + min_gap
     radius = circle_diameter / 2.0
     attempts = 0
     indices = list(range(len(points_inch)))
-    random.shuffle(indices)  # Shuffle candidate indices for randomness
+    random.shuffle(indices)  # Shuffle indices for randomness
 
     for i in indices:
         if attempts >= max_attempts:
             break
         cx, cy = points_inch[i]
-        # Try small adjustments around the candidate point
+        # Try small adjustments around the chosen candidate
         for dx in np.linspace(-0.1, 0.1, 5):
             for dy in np.linspace(-0.1, 0.1, 5):
                 candidate_center = (cx + dx, cy + dy)
                 # Check distance from already placed centers
                 if any(np.hypot(candidate_center[0] - ex, candidate_center[1] - ey) < needed_center_distance for ex, ey in existing_centers):
                     continue
-                # Build the circle polygon
                 circle_poly = Point(candidate_center).buffer(radius, resolution=64)
-                # Ensure the circle actually intersects the tool polygon
-                if not circle_poly.intersects(tool_polygon):
-                    continue
-                # Compute the union
                 union_poly = tool_polygon.union(circle_poly)
-                # If the union is a MultiPolygon, then the circle is not fused with the tool
-                if union_poly.geom_type == "MultiPolygon":
-                    continue
-                # Check overlap with other tools
                 overlap = False
+                # Check against other tool polygons for overlap or proximity issues
                 for poly in all_polygons:
                     if union_poly.intersects(poly) or circle_poly.buffer(min_gap).intersects(poly):
                         overlap = True
                         break
                 if overlap:
                     continue
-                # Accept candidate if all checks pass
+                # If candidate passes, accept it
                 existing_centers.append(candidate_center)
                 return union_poly, candidate_center
         attempts += 1
@@ -433,7 +417,7 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
     else:
         if text_top > (min_y - 0.75):
             raise TextOverlapError("Error: The Text is overlapping the inner contours of the object.")
-    
+        
     return boundary_polygon
 
 def draw_polygons_inch(polygons_inch, image_rgb, scaling_factor, image_height, color=(0,0,255), thickness=2):
@@ -695,8 +679,10 @@ def predict(
         text_y_img = int(processed_size[0] - (text_y_in / scaling_factor))
         org = (text_x_img - int(len(annotation_text.strip()) * 6), text_y_img)
 
-        # Draw thicker outline using a temporary image for dual-thickness text
+        # Method 2: Use two different thicknesses
+        # Draw thicker outline
         temp_img = np.zeros_like(output_img)
+
         cv2.putText(
             temp_img,
             annotation_text.strip().upper(),
@@ -707,18 +693,21 @@ def predict(
             4,  # Thicker outline
             cv2.LINE_AA
         )
+
         cv2.putText(
             temp_img,
             annotation_text.strip().upper(),
             org,
             cv2.FONT_HERSHEY_SIMPLEX,
             2,
-            (0, 0, 0),  # Black to create inner hole
+            (0, 0, 0),  # Black to create hole
             2,  # Thinner inner part
             cv2.LINE_AA
         )
+
         outline_mask = cv2.cvtColor(temp_img, cv2.COLOR_BGR2GRAY)
         _, outline_mask = cv2.threshold(outline_mask, 1, 255, cv2.THRESH_BINARY)
+
         output_img[outline_mask > 0] = temp_img[outline_mask > 0]
                 
         cv2.putText(
@@ -731,6 +720,7 @@ def predict(
             4,  # Thicker outline
             cv2.LINE_AA
         )
+        
         cv2.putText(
             new_outlines,
             annotation_text.strip().upper(),