Update app.py

app.py

@@ -54,6 +54,9 @@ class TextOverlapError(Exception):
     """Raised when the text overlaps with the inner contours (with a margin of 0.75).Please provide larger value for boundary length and width."""
     pass
 
+class FingerCutOverlapError(Exception):
+    """There was an overlap with fingercuts... Please try again to generate dxf."""
+    pass
 # ---------------------
 # Global Model Initialization with caching and print statements
 # ---------------------
@@ -243,420 +246,6 @@ def exclude_scaling_box(image: np.ndarray, bbox: np.ndarray, orig_size: tuple, p
     image[expanded_y_min:expanded_y_max, expanded_x_min:expanded_x_max] = 0
     return image
 
-# def resample_contour(contour):
-#     num_points = 1000
-#     smoothing_factor = 5
-#     spline_degree = 3
-#     if len(contour) < spline_degree + 1:
-#         raise ValueError(f"Contour must have at least {spline_degree + 1} points, but has {len(contour)} points.")
-#     contour = contour[:, 0, :]
-#     tck, _ = splprep([contour[:, 0], contour[:, 1]], s=smoothing_factor)
-#     u = np.linspace(0, 1, num_points)
-#     resampled_points = splev(u, tck)
-#     smoothed_x = gaussian_filter1d(resampled_points[0], sigma=1)
-#     smoothed_y = gaussian_filter1d(resampled_points[1], sigma=1)
-#     return np.array([smoothed_x, smoothed_y]).T
-
-# # ---------------------
-# # Add the missing extract_outlines function
-# # ---------------------
-# def extract_outlines(binary_image: np.ndarray) -> (np.ndarray, list):
-#     contours, _ = cv2.findContours(binary_image, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_NONE)
-#     outline_image = np.zeros_like(binary_image)
-#     cv2.drawContours(outline_image, contours, -1, (255), thickness=2)
-#     return cv2.bitwise_not(outline_image), contours
-
-# # # ---------------------
-# # # Functions for Finger Cut Clearance
-# # # ---------------------
-# # def union_tool_and_circle(tool_polygon: Polygon, center_inch, circle_diameter=1.0):
-# #     radius = circle_diameter / 2.0
-# #     circle_poly = Point(center_inch).buffer(radius, resolution=64)
-# #     union_poly = tool_polygon.union(circle_poly)
-# #     return union_poly
-
-
-
-
-# # def build_tool_polygon(points_inch):
-# #     return Polygon(points_inch)
-
-# # def polygon_to_exterior_coords(poly: Polygon):
-# #     if poly.geom_type == "MultiPolygon":
-# #         biggest = max(poly.geoms, key=lambda g: g.area)
-# #         poly = biggest
-# #     if not poly.exterior:
-# #         return []
-# #     return list(poly.exterior.coords)
-
-
-# # from shapely.geometry import Point, Polygon
-# # import numpy as np
-# # import random
-
-# # from shapely.geometry import Point, Polygon
-# # import numpy as np
-# # import random
-
-# # def place_finger_cut_adjusted(
-# #     tool_polygon: Polygon,
-# #     points_inch: list,
-# #     existing_centers: list,
-# #     all_polygons: list,
-# #     circle_diameter: float = 1.0,
-# #     min_gap: float = 0.5,
-# #     max_attempts: int = 100
-# # ) -> (Polygon, tuple):
-
-# #     needed_center_distance = circle_diameter + min_gap
-# #     radius = circle_diameter / 2.0
-# #     attempts = 0
-# #     timeout_secs = 10  # 100s timeout
-# #     start_time = time.perf_counter()
-# #     fallback_triggered = False
-
-# #     # Randomize candidate points order.
-# #     indices = list(range(len(points_inch)))
-# #     random.shuffle(indices)
-
-# #     while attempts < max_attempts and not fallback_triggered:
-# #         for i in indices:
-# #             if time.perf_counter() - start_time >= timeout_secs:
-# #                 fallback_triggered = True
-# #                 break
-# #             cx, cy = points_inch[i]
-# #             # Try small adjustments around the candidate point.
-# #             for dx in np.linspace(-0.3, 0.3, 7):  # adjust by ±0.3 inches in 7 steps
-# #                 for dy in np.linspace(-0.3, 0.3, 7):
-# #                     if time.perf_counter() - start_time >= timeout_secs:
-# #                         fallback_triggered = True
-# #                         break
-# #                     candidate_center = (cx + dx, cy + dy)
-                    
-# #                     # Ensure candidate center is not too close to any 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
-
-# #                     # Create candidate circle with a high resolution.
-# #                     candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-                    
-# #                     # Reject candidate if circle is completely inside the tool polygon.
-# #                     if tool_polygon.contains(candidate_circle):
-# #                         continue
-                    
-# #                     # Also reject candidate if circle does not intersect the tool at all.
-# #                     if not candidate_circle.intersects(tool_polygon):
-# #                         continue
-                    
-                    
-# #                     # Ensure that the candidate circle crosses the tool boundary.
-# #                     inter_area = candidate_circle.intersection(tool_polygon).area
-# #                     if inter_area <= 0 or inter_area >= candidate_circle.area:
-# #                         continue
-
-# #                     # Verify candidate circle is not too close to any neighboring tool polygons.
-# #                     too_close = False
-# #                     for other_poly in all_polygons:
-# #                         if other_poly.equals(tool_polygon):
-# #                             continue
-# #                         if candidate_circle.buffer(0.1).intersects(other_poly):
-# #                             too_close = True
-# #                         if other_poly.distance(candidate_circle) < min_gap:
-# #                             too_close = True
-# #                             break
-# #                     if too_close:
-# #                         continue
-                    
-# #                     # Attempt the union, using a buffering trick to fix potential geometry problems.
-# #                     try:
-# #                         union_poly = tool_polygon.union(candidate_circle)
-# #                     except Exception:
-# #                         union_poly = tool_polygon.buffer(0).union(candidate_circle.buffer(0))
-                    
-# #                     # Verify that the union is a single contiguous polygon.
-# #                     if union_poly.geom_type == "MultiPolygon" and len(union_poly.geoms) > 1:
-# #                         continue
-                    
-# #                     # If the union did not change the polygon (no effective union), skip candidate.
-# #                     if union_poly.equals(tool_polygon):
-# #                         continue
-                    
-# #                     # We have found a valid candidate.
-# #                     existing_centers.append(candidate_center)
-# #                     return union_poly, candidate_center
-# #                 if fallback_triggered:
-# #                     break
-# #         attempts += 1
-# #     if fallback_triggered:
-# #         print("In fallback block")
-        
-# #     # Fallback: If no candidate was found after max_attempts, force a candidate from median of points.
-# #     candidate_center = points_inch[len(points_inch) // 2]
-# #     candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-# #     try:
-# #         too_close= False
-# #         for other_poly in all_polygons:
-            
-# #             if other_poly.equals(tool_polygon):
-# #                 continue
-# #             if candidate_circle.buffer(0.1).intersects(other_poly):
-# #                 too_close = True
-# #             if other_poly.distance(candidate_circle) < min_gap:
-# #                 too_close = True
-# #             if too_close:
-# #                 continue
-# #         union_poly = tool_polygon.union(candidate_circle)
-# #     except Exception:
-# #         too_close= False
-# #         for other_poly in all_polygons:
-            
-# #             if other_poly.equals(tool_polygon):
-# #                 continue
-# #             if candidate_circle.buffer(0.1).intersects(other_poly):
-# #                 too_close = True
-# #             if other_poly.distance(candidate_circle) < min_gap:
-# #                 too_close = True
-# #             if too_close:
-# #                 continue
-# #         union_poly = tool_polygon.buffer(0).union(candidate_circle.buffer(0))
-# #     existing_centers.append(candidate_center)
-# #     return union_poly, candidate_center
-
-# # # ---------------------
-# # # DXF Spline and Boundary Functions
-# # # ---------------------
-# # def save_dxf_spline(inflated_contours, scaling_factor, height, finger_clearance=False):
-#     degree = 3
-#     closed = True
-#     doc = ezdxf.new(units=0)
-#     doc.units = ezdxf.units.IN
-#     doc.header["$INSUNITS"] = ezdxf.units.IN
-#     msp = doc.modelspace()
-#     finger_cut_centers = []
-#     final_polygons_inch = []
-#     for contour in inflated_contours:
-#         try:
-#             resampled_contour = resample_contour(contour)
-#             points_inch = [(x * scaling_factor, (height - y) * scaling_factor) for x, y in resampled_contour]
-#             if len(points_inch) < 3:
-#                 continue
-#             if np.linalg.norm(np.array(points_inch[0]) - np.array(points_inch[-1])) > 1e-2:
-#                 points_inch.append(points_inch[0])
-#             tool_polygon = build_tool_polygon(points_inch)
-#             if finger_clearance:
-#                 union_poly, center = place_finger_cut_adjusted(tool_polygon, points_inch, finger_cut_centers, final_polygons_inch, circle_diameter=1.0, min_gap=0.25, max_attempts=100)
-#                 if union_poly is not None:
-#                     tool_polygon = union_poly
-#             exterior_coords = polygon_to_exterior_coords(tool_polygon)
-#             if len(exterior_coords) < 3:
-#                 continue
-#             msp.add_spline(exterior_coords, degree=degree, dxfattribs={"layer": "TOOLS"})
-#             final_polygons_inch.append(tool_polygon)
-#         except ValueError as e:
-#             print(f"Skipping contour: {e}")
-#     return doc, final_polygons_inch
-
-# import random
-# import time
-# import numpy as np
-# from shapely.geometry import Point, Polygon
-
-# # ---------------------
-# # Utility functions
-# # ---------------------
-# def union_tool_and_circle(tool_polygon: Polygon, center_inch, circle_diameter=1.0):
-#     radius = circle_diameter / 2.0
-#     circle_poly = Point(center_inch).buffer(radius, resolution=64)
-#     union_poly = tool_polygon.union(circle_poly)
-#     return union_poly
-
-# def build_tool_polygon(points_inch):
-#     return Polygon(points_inch)
-
-# def polygon_to_exterior_coords(poly: Polygon):
-#     if poly.geom_type == "MultiPolygon":
-#         biggest = max(poly.geoms, key=lambda g: g.area)
-#         poly = biggest
-#     if not poly.exterior:
-#         return []
-#     return list(poly.exterior.coords)
-
-# ---------------------
-# Main candidate placement function
-# ---------------------
-# def place_finger_cut_adjusted(
-#     tool_polygon1: Polygon,
-#     points_inch: list,
-#     existing_centers: list,
-#     all_polygons: list,
-#     circle_diameter: float = 1.0,
-#     min_gap: float = 0.5,
-#     max_attempts: int = 100
-# ) -> (Polygon, tuple):
-#     """
-#     Adjust and union a candidate circle (finger cut) with the tool_polygon.
-#     If a candidate meeting all conditions is found, update existing_centers
-#     and return the union and candidate_center.
-    
-#     If no candidate is found after max_attempts (or if a timeout is reached),
-#     use a fallback candidate (the median point from points_inch).
-#     """
-#     needed_center_distance = circle_diameter + min_gap
-#     radius = circle_diameter / 2.0
-#     attempts = 0
-#     timeout_secs = 0.1  # 100ms timeout
-#     start_time = time.perf_counter()
-#     fallback_triggered = False
-#     tool_polygon= tool_polygon1
-
-#     # Randomize candidate points order.
-#     indices = list(range(len(points_inch)))
-#     random.shuffle(indices)
-
-#     while attempts < max_attempts and not fallback_triggered:
-#         for i in indices:
-#             if time.perf_counter() - start_time >= timeout_secs:
-#                 fallback_triggered = True
-#                 break
-#             cx, cy = points_inch[i]
-#             # Try small adjustments around the candidate point.
-#             for dx in np.linspace(-0.3, 0.3, 7):
-#                 for dy in np.linspace(-0.3, 0.3, 7):
-#                     if time.perf_counter() - start_time >= timeout_secs:
-#                         fallback_triggered = True
-#                         break
-#                     candidate_center = (cx + dx, cy + dy)
-                    
-#                     # Ensure candidate center is not too close to any 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
-
-#                     # Create candidate circle with high resolution.
-#                     candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-                    
-#                     # Reject candidate if circle is completely inside the tool polygon.
-#                     if tool_polygon.contains(candidate_circle):
-#                         continue
-#                     # Reject candidate if circle does not intersect the tool at all.
-#                     if not candidate_circle.intersects(tool_polygon):
-#                         continue
-#                     # Ensure that the candidate circle crosses the tool boundary.
-#                     inter_area = candidate_circle.intersection(tool_polygon).area
-#                     if inter_area <= 0 or inter_area >= candidate_circle.area:
-#                         continue
-
-#                     # Verify candidate circle is not too close to any neighboring tool polygons.
-#                     too_close = False
-#                     for other_poly in all_polygons:
-#                         if other_poly.equals(tool_polygon):
-#                             continue
-#                         # Use a small buffer around the circle for safety.
-#                         if candidate_circle.buffer(0.1).intersects(other_poly):
-#                             too_close = True
-#                         if other_poly.distance(candidate_circle) < min_gap:
-#                             too_close = True
-#                             break
-#                     if too_close:
-#                         continue
-                    
-#                     # Attempt the union, using buffering to fix any potential geometry issues.
-#                     try:
-#                         union_poly = tool_polygon.union(candidate_circle)
-#                     except Exception:
-#                         union_poly = tool_polygon.buffer(0).union(candidate_circle.buffer(0))
-                    
-#                     # Clean the unioned polygon.
-#                     union_poly = union_poly.buffer(0)
-                    
-#                     # Verify that the union is a single contiguous polygon.
-#                     if union_poly.geom_type == "MultiPolygon" and len(union_poly.geoms) > 1:
-#                         continue
-                    
-#                     # If the union did not change the tool polygon (no effective union), skip candidate.
-#                     if union_poly.equals(tool_polygon):
-#                         continue
-                    
-#                     # We have found a valid candidate. Update the centers list.
-#                     existing_centers.append(candidate_center)
-#                     return tool_polygon1, existing_centers[-1]
-#                 if fallback_triggered:
-#                     break
-#         attempts += 1
-
-#     # Fallback: If no candidate is found (or timeout reached), use a fallback candidate.
-#     if fallback_triggered:
-#         print("Fallback triggered")
-#     # Use a fallback candidate – here the median point is used.
-#     xs = [p[0] for p in points_inch]
-#     ys = [p[1] for p in points_inch]
-#     candidate_center = (np.median(xs), np.median(ys))
-#     candidate_circle = Point(candidate_center).buffer(radius, resolution=64)
-#     try:
-#         union_poly = tool_polygon.union(candidate_circle)
-#     except Exception:
-#         union_poly = tool_polygon.buffer(0).union(candidate_circle.buffer(0))
-#     union_poly = union_poly.buffer(0)
-#     # Add the fallback center to avoid duplicate placements later.
-#     existing_centers.append(candidate_center)
-#     return tool_polygon1, existing_centers[-1]
-
-# ---------------------
-# DXF Spline and Boundary Functions
-# ---------------------
-# def save_dxf_spline(inflated_contours, scaling_factor, height, finger_clearance=False):
-#     import ezdxf  # assuming ezdxf is installed
-#     degree = 3
-#     closed = True
-#     doc = ezdxf.new(units=0)
-#     doc.units = ezdxf.units.IN
-#     doc.header["$INSUNITS"] = ezdxf.units.IN
-#     msp = doc.modelspace()
-
-#     # Global shared lists for finger cut centers and final tool polygons.
-#     finger_cut_centers = []
-#     final_polygons_inch = []
-
-#     for contour in inflated_contours:
-#         try:
-#             # resample_contour should be defined elsewhere;
-#             # here it returns a list of (x, y) points.
-#             resampled_contour = resample_contour(contour)
-#             # Scale and flip Y coordinate according to height.
-#             points_inch = [(x * scaling_factor, (height - y) * scaling_factor) for x, y in resampled_contour]
-            
-#             if len(points_inch) < 3:
-#                 continue
-
-#             # Ensure the polygon is closed.
-#             if np.linalg.norm(np.array(points_inch[0]) - np.array(points_inch[-1])) > 1e-2:
-#                 points_inch.append(points_inch[0])
-            
-#             tool_polygon = build_tool_polygon(points_inch)
-            
-#             # Add finger clearance cuts if needed.
-#             if finger_clearance:
-#                 tool, center = place_finger_cut_adjusted(
-#                     tool_polygon, points_inch, finger_cut_centers, final_polygons_inch,
-#                     circle_diameter=1.0, min_gap=0.25, max_attempts=100
-#                 )
-#                 union_poly=union_tool_and_circle(tool,center)
-#                 if union_poly is not None:
-#                     tool_polygon = union_poly
-            
-#             exterior_coords = polygon_to_exterior_coords(tool_polygon)
-#             if len(exterior_coords) < 3:
-#                 continue
-
-#             # Add the tool geometry to the DXF document as a spline.
-#             msp.add_spline(exterior_coords, degree=degree, dxfattribs={"layer": "TOOLS"})
-#             final_polygons_inch.append(tool_polygon)
-#         except ValueError as e:
-#             print(f"Skipping contour: {e}")
-    
-#     return doc, final_polygons_inch
-
 import logging
 import time
 import signal
@@ -782,26 +371,6 @@ def build_tool_polygon(points_inch):
         logger.error(f"Error in build_tool_polygon: {e}")
         raise
 
-# def polygon_to_exterior_coords(poly: Polygon):
-#     logger.info(f"Starting polygon_to_exterior_coords with polygon type {poly.geom_type}")
-    
-#     try:
-#         if poly.geom_type == "MultiPolygon":
-#             logger.debug("Converting MultiPolygon to single Polygon")
-#             biggest = max(poly.geoms, key=lambda g: g.area)
-#             poly = biggest
-            
-#         if not poly.exterior:
-#             logger.warning("Polygon has no exterior")
-#             return []
-            
-#         coords = list(poly.exterior.coords)
-#         logger.info(f"Completed polygon_to_exterior_coords with {len(coords)} coordinates")
-#         return coords
-#     except Exception as e:
-#         logger.error(f"Error in polygon_to_exterior_coords: {e}")
-#         raise
-
 def polygon_to_exterior_coords(poly):
     logger.info(f"Starting polygon_to_exterior_coords with polygon type {poly.geom_type}")
     
@@ -1034,6 +603,14 @@ def save_dxf_spline(offset_value,inflated_contours, scaling_factor, height, fing
                 if len(exterior_coords) < 3:
                     logger.warning(f"Skipping contour {idx}: insufficient exterior points ({len(exterior_coords)})")
                     continue
+                for existing_poly in final_polygons_inch:
+                    if tool_polygon.intersects(existing_poly):
+                        # Check if the intersection is more than just touching points
+                        intersection = tool_polygon.intersection(existing_poly)
+                        # If the intersection has ANY area (not just points touching)
+                        if intersection.area > 0:  # Zero tolerance for overlap
+                            logger.error(f"Polygon {idx} overlaps with an existing polygon")
+                            raise FingerCutOverlapError("There was an overlap with fingercuts... Please try again to generate dxf.")
                     
                 msp.add_spline(exterior_coords, degree=degree, dxfattribs={"layer": "TOOLS"})
                 final_polygons_inch.append(tool_polygon)