Update app.py

app.py

@@ -286,292 +286,6 @@ 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,  # Finger cut circle diameter in inches.
-#     min_gap=0.25,         # Minimum clearance (in inches) between the finger cut and adjacent contours.
-#     max_attempts=50       # Maximum candidate attempts.
-# ):
-#     """
-#     Attempts to place a finger-cut circle along the tool polygon's contour, biased toward one side
-#     (the boundary side) by shifting the candidate center away from the polygon centroid.
-#     The candidate circle is merged with the tool polygon via union_tool_and_circle().
-#     Debug information is printed to help trace candidate evaluation.
-
-#     :param tool_polygon: Shapely Polygon representing the tool contour.
-#     :param points_inch: List of (x, y) points (in inches) along the contour.
-#     :param existing_centers: List of already accepted finger cut centers.
-#     :param all_polygons: List of all polygons (for overlap checking).
-#     :param circle_diameter: Diameter of the finger cut (in inches).
-#     :param min_gap: Clearance (in inches) required between the finger cut and any adjacent contour.
-#     :param max_attempts: Maximum number of candidate attempts.
-#     :return: (updated_polygon, candidate_center) if successful; otherwise, (None, None).
-#     """
-#     import random
-#     from shapely.geometry import Point
-#     import numpy as np
-
-#     needed_center_distance = circle_diameter + min_gap
-#     radius = circle_diameter / 2.0
-#     attempts = 0
-
-#     # Parameter: how far to push the candidate center outward.
-#     # Here we set it to half the circle radius, but you can adjust this as needed.
-#     outward_offset = radius * 0.1
-
-#     # Compute the centroid of the tool polygon once.
-#     polygon_centroid = tool_polygon.centroid
-
-#     # Create a safe version of the polygon via an inward buffer.
-#     safe_tool_polygon = tool_polygon.buffer(-min_gap)
-#     if safe_tool_polygon.is_empty:
-#         safe_tool_polygon = tool_polygon
-
-#     # Shuffle the contour indices for randomness.
-#     indices = list(range(len(points_inch)))
-#     random.shuffle(indices)
-
-#     for i in indices:
-#         if attempts >= max_attempts:
-#             break
-
-#         # Base candidate point from the resampled contour:
-#         base_x, base_y = points_inch[i]
-
-#         # Try a grid of offsets from this candidate base point.
-#         for dx in np.linspace(-0.3, 0.3, 15):
-#             for dy in np.linspace(-0.3, 0.3, 15):
-#                 # Compute an initial candidate point.
-#                 candidate_unshifted = (base_x + dx, base_y + dy)
-                
-#                 # Compute the outward direction based on the vector from the centroid to candidate.
-#                 vec_x = candidate_unshifted[0] - polygon_centroid.x
-#                 vec_y = candidate_unshifted[1] - polygon_centroid.y
-#                 norm = np.hypot(vec_x, vec_y)
-#                 if norm == 0:
-#                     continue  # Skip degenerate case.
-#                 # Normalize the outward vector.
-#                 unit_vec = (vec_x / norm, vec_y / norm)
-#                 # Push the candidate center further out so it lies along the boundary.
-#                 candidate_center = (candidate_unshifted[0] + unit_vec[0] * outward_offset,
-#                                     candidate_unshifted[1] + unit_vec[1] * outward_offset)
-
-#                 # Check that candidate center is not too close to previously accepted centers.
-#                 if any(np.hypot(candidate_center[0] - ex, candidate_center[1] - ey) < needed_center_distance 
-#                        for ex, ey in existing_centers):
-#                     continue
-
-#                 # Create the candidate circle.
-#                 candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-                
-#                 # Check if the candidate circle is mostly on the boundary:
-#                 area_ratio = candidate_circle.intersection(tool_polygon).area / candidate_circle.area
-#                 # Debug: Show candidate center and its area ratio.
-#                 #print(f"Candidate center: {candidate_center}, area_ratio: {area_ratio:.2f}")
-#                 # Accept if at least 70% of the circle's area lies within the tool polygon.
-#                 if area_ratio < 0.6:  
-#                     continue
-
-#                 # Merge candidate circle with tool polygon using the existing union function.
-#                 candidate_union = union_tool_and_circle(tool_polygon, candidate_center, circle_diameter)
-
-#                 # Overlap check: ensure this candidate does not intrude on any other object.
-#                 overlap = False
-#                 for other_poly in all_polygons:
-#                     if other_poly.equals(tool_polygon):
-#                         continue
-#                     if candidate_union.intersects(other_poly) or candidate_circle.buffer(min_gap).intersects(other_poly):
-#                         overlap = True
-#                         #print(f"Candidate at {candidate_center} rejected due to overlap.")
-#                         break
-#                 if overlap:
-#                     continue
-
-#                 # Candidate accepted.
-#                 print(f"Accepted candidate center: {candidate_center} with area_ratio: {area_ratio:.2f}")
-#                 existing_centers.append(candidate_center)
-#                 return candidate_union, candidate_center
-
-#         attempts += 1
-
-#     print("Warning: Could not place a finger cut circle meeting all spacing requirements.")
-#     return None, None
-
-
-# def place_finger_cut_adjusted(
-#     tool_polygon,
-#     points_inch,
-#     existing_centers,
-#     all_polygons,
-#     circle_diameter=1.0,  # Finger cut circle diameter in inches.
-#     min_gap=0.25,         # Minimum clearance (in inches) between the finger cut and adjacent contours.
-#     max_attempts=50       # Maximum candidate attempts.
-# ):
-#     """
-#     Attempts to place a finger-cut circle along the tool polygon's contour, biased toward one side
-#     (the boundary side) by shifting the candidate center away from the polygon centroid.
-#     Simplified version that maintains core functionality while using a more streamlined approach.
-    
-#     :param tool_polygon: Shapely Polygon representing the tool contour.
-#     :param points_inch: List of (x, y) points (in inches) along the contour.
-#     :param existing_centers: List of already accepted finger cut centers.
-#     :param all_polygons: List of all polygons (for overlap checking).
-#     :param circle_diameter: Diameter of the finger cut (in inches).
-#     :param min_gap: Clearance (in inches) required between the finger cut and any adjacent contour.
-#     :param max_attempts: Maximum number of candidate attempts.
-#     :return: (updated_polygon, candidate_center) if successful; otherwise, (None, None).
-#     """
-#     import random
-#     import numpy as np
-#     from shapely.geometry import Point
-    
-#     needed_center_distance = circle_diameter + min_gap
-#     radius = circle_diameter / 2.0
-    
-#     # Compute the centroid of the tool polygon once.
-#     polygon_centroid = tool_polygon.centroid
-    
-#     # Parameter: how far to push the candidate center outward.
-#     outward_offset = radius * 0.5
-    
-#     # Try random points along the contour
-#     indices = list(range(len(points_inch)))
-#     random.shuffle(indices)
-    
-#     for idx in indices[:max_attempts]:
-#         # Get base point from contour
-#         base_x, base_y = points_inch[idx]
-        
-#         # Calculate the outward vector from centroid to point
-#         vec_x = base_x - polygon_centroid.x
-#         vec_y = base_y - polygon_centroid.y
-#         norm = np.hypot(vec_x, vec_y)
-        
-#         if norm == 0:
-#             continue  # Skip if point is at centroid
-            
-#         # Normalize and calculate shifted candidate center
-#         unit_vec = (vec_x / norm, vec_y / norm)
-#         candidate_center = (base_x + unit_vec[0] * outward_offset,
-#                            base_y + unit_vec[1] * outward_offset)
-        
-#         # Check distance from existing centers
-#         too_close = False
-#         for (ex_x, ex_y) in existing_centers:
-#             if np.hypot(candidate_center[0] - ex_x, candidate_center[1] - ex_y) < needed_center_distance:
-#                 too_close = True
-#                 break
-                
-#         if too_close:
-#             continue
-            
-#         # Create the candidate circle
-#         candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-        
-#         # Check if circle is mostly on the boundary (at least 60% inside)
-#         area_ratio = candidate_circle.intersection(tool_polygon).area / candidate_circle.area
-#         if area_ratio < 0.6:
-#             continue
-            
-#         # Merge candidate with tool polygon
-#         union_poly = union_tool_and_circle(tool_polygon, candidate_center, circle_diameter)
-        
-#         # Check for overlaps with other polygons
-#         overlap = False
-#         for other_poly in all_polygons:
-#             if other_poly.equals(tool_polygon):
-#                 continue
-#             if union_poly.intersects(other_poly) or candidate_circle.buffer(min_gap).intersects(other_poly):
-#                 overlap = True
-#                 break
-                
-#         if overlap:
-#             continue
-            
-#         # Candidate accepted
-#         print(f"Accepted candidate center: {candidate_center} with area_ratio: {area_ratio:.2f}")
-#         existing_centers.append(candidate_center)
-#         return union_poly, candidate_center
-    
-#     print("Warning: Could not place a finger cut circle meeting all spacing requirements.")
-#     return None, None
-
-
-# def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_polygons, circle_diameter=1.0, min_gap=0.25, max_attempts=100):
-#     import random
-#     needed_center_distance = circle_diameter + min_gap
-#     radius = circle_diameter / 2.0
-#     for _ in range(max_attempts):
-#         idx = random.randint(0, len(points_inch) - 1)
-#         cx, cy = points_inch[idx]
-#         too_close = False
-#         for (ex_x, ex_y) in existing_centers:
-#             if np.hypot(cx - ex_x, cy - ex_y) < needed_center_distance:
-#                 too_close = True
-#                 break
-#         if too_close:
-#             continue
-#         circle_poly = Point((cx, cy)).buffer(radius, resolution=64)
-#         union_poly = tool_polygon.union(circle_poly)
-#         overlap_with_others = False
-#         too_close_to_others = False
-#         for poly in all_polygons:
-#             if union_poly.intersects(poly):
-#                 overlap_with_others = True
-#                 break
-#             if circle_poly.buffer(min_gap).intersects(poly):
-#                 too_close_to_others = True
-#                 break
-#         if overlap_with_others or too_close_to_others:
-#             continue
-#         existing_centers.append((cx, cy))
-#         return union_poly, (cx, cy)
-#     print("Warning: Could not place a finger cut circle meeting all spacing requirements.")
-#     return None, None
-
-# def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_polygons, 2nd best
-#                               circle_diameter=1.0, min_gap=0.25, max_attempts=30):
-#     import random
-#     from shapely.geometry import Point
-
-#     # Analyze bounding box
-#     bounds = tool_polygon.bounds  # (minx, miny, maxx, maxy)
-#     width = bounds[2] - bounds[0]
-#     height = bounds[3] - bounds[1]
-#     min_dim = min(width, height)
-
-#     # Adjust circle diameter based on tool size
-#     scale_factor = min(1.0, min_dim / 2.0)  # Adjust this factor to control size sensitivity
-#     adjusted_diameter = circle_diameter * scale_factor
-#     radius = adjusted_diameter / 2.0
-#     needed_center_distance = adjusted_diameter + min_gap
-
-#     for _ in range(max_attempts):
-#         idx = random.randint(0, len(points_inch) - 1)
-#         cx, cy = points_inch[idx]
-
-#         # Check distance from existing centers
-#         if any(np.hypot(cx - ex_x, cy - ex_y) < needed_center_distance for ex_x, ex_y in existing_centers):
-#             continue
-
-#         circle_poly = Point((cx, cy)).buffer(radius, resolution=64)
-#         union_poly = tool_polygon.union(circle_poly)
-
-#         overlap_with_others = any(union_poly.intersects(poly) for poly in all_polygons)
-#         too_close_to_others = any(circle_poly.buffer(min_gap).intersects(poly) for poly in all_polygons)
-
-#         if overlap_with_others or too_close_to_others:
-#             continue
-
-#         existing_centers.append((cx, cy))
-#         return union_poly, (cx, cy)
-
-#     print("Warning: Could not place a finger cut circle meeting all spacing requirements.")
-#     return None, None
-
 
 def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_polygons, circle_diameter=1.0, min_gap=0.25, max_attempts=30): #1st best
     needed_center_distance = circle_diameter + min_gap
@@ -616,110 +330,6 @@ def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_p
     return None, None
 
 
-# def place_finger_cut_adjusted(tool_polygon, points_inch, existing_centers, all_polygons,
-#                               circle_diameter=1.0, min_gap=0.25, max_attempts=30):
-#     fallback_diameters = [circle_diameter, 0.75, 0.5, 0.4]  # Try these in order
-
-#     for fallback_d in fallback_diameters:
-#         radius = fallback_d / 2.0
-#         needed_center_distance = fallback_d + min_gap
-
-#         for _ in range(max_attempts):
-#             idx = random.randint(0, len(points_inch) - 1)
-#             cx, cy = points_inch[idx]
-
-#             # Check distance from existing centers
-#             too_close = any(np.hypot(cx - ex_x, cy - ex_y) < needed_center_distance
-#                             for ex_x, ex_y in existing_centers)
-#             if too_close:
-#                 continue
-
-#             # Create and check the finger cut circle
-#             circle_poly = Point((cx, cy)).buffer(radius, resolution=64)
-#             union_poly = tool_polygon.union(circle_poly)
-
-#             if not union_poly.is_valid:
-#                 continue  # Skip invalid geometry
-
-#             # Check against all other polygons strictly
-#             overlap = False
-#             for poly in all_polygons:
-#                 if poly.equals(tool_polygon):
-#                     continue
-
-#                 # Shrink slightly to avoid even edge contact
-#                 if union_poly.intersects(poly.buffer(-1e-3)):
-#                     overlap = True
-#                     break
-#                 if circle_poly.buffer(min_gap).intersects(poly):
-#                     overlap = True
-#                     break
-
-#             if overlap:
-#                 continue
-
-#             # Final sanity check
-#             for poly in all_polygons:
-#                 if poly.equals(tool_polygon):
-#                     continue
-#                 if union_poly.intersects(poly):
-#                     print("Overlap slipped through. Rejecting.")
-#                     overlap = True
-#                     break
-
-#             if overlap:
-#                 continue
-
-#             existing_centers.append((cx, cy))
-#             return union_poly, (cx, cy)
-
-#     # If we get here, all attempts failed — still try placing smallest fallback
-#     print("Warning: Could not place cleanly. Forcing smallest fallback.")
-#     smallest_radius = fallback_diameters[-1] / 2.0
-#     for _ in range(100):
-#         idx = random.randint(0, len(points_inch) - 1)
-#         cx, cy = points_inch[idx]
-#         circle_poly = Point((cx, cy)).buffer(smallest_radius, resolution=64)
-#         union_poly = tool_polygon.union(circle_poly)
-#         if union_poly.is_valid:
-#             existing_centers.append((cx, cy))
-#             return union_poly, (cx, cy)
-
-#     # Absolute fallback — return original tool without finger cut
-#     print("Failed to place even smallest fallback. No cutout added.")
-#     return tool_polygon, None
-
-
-# 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
-#     import numpy as np
-#     from shapely.geometry import Point, Polygon
-
-#     needed_center_distance = circle_diameter + min_gap
-#     radius = circle_diameter / 2.0
-#     for _ in range(max_attempts):
-#         idx = random.randint(0, len(points_inch) - 1)
-#         cx, cy = points_inch[idx]
-#         # Check against existing centers
-#         too_close = any(np.hypot(cx - ex_x, cy - ex_y) < needed_center_distance for (ex_x, ex_y) in existing_centers)
-#         if too_close:
-#             continue
-#         circle_poly = Point((cx, cy)).buffer(radius, resolution=64)
-#         # Ensure circle intersects the tool to form a valid cut
-#         if not circle_poly.intersects(tool_polygon):
-#             continue
-#         # Check proximity to other polygons
-#         if any(circle_poly.buffer(min_gap).intersects(poly) for poly in all_polygons):
-#             continue
-#         # Subtract circle from tool and check for overlaps
-#         difference_poly = tool_polygon.difference(circle_poly)
-#         if any(difference_poly.intersects(poly) for poly in all_polygons):
-#             continue
-#         existing_centers.append((cx, cy))
-#         return difference_poly, (cx, cy)
-#     print("Warning: Could not place a finger cut circle meeting all spacing requirements.")
-#     return None, None
-
 
 # ---------------------
 # DXF Spline and Boundary Functions
@@ -1171,8 +781,8 @@ if __name__ == "__main__":
             gr.Textbox(label="Scaling Factor (inches/pixel)")
         ],
         examples=[
-            ["./Test20.jpg", 0.075, "inches", "No", "No", 300.0, 200.0, "MyTool"],
-            ["./Test21.jpg", 0.075, "inches", "Yes", "Yes", 300.0, 200.0, "Tool2"]
+            ["./Test20.jpg", 0.075, "inches", "No", "No", 30.0, 20.0, "MyTool"],
+            ["./Test21.jpg", 0.075, "inches", "Yes", "Yes", 30.0, 20.0, "Tool2"]
         ]
     )
     iface.launch(share=True)