Update app.py

app.py

@@ -218,7 +218,7 @@ def shrink_bbox(image: np.ndarray, shrink_factor: float):
     x1 = max(center_x - new_width // 2, 0)
     y1 = max(center_y - new_height // 2, 0)
     x2 = min(center_x + new_width // 2, width)
-    y2 = min(center_y + new_width // 2, height)
+    y2 = min(center_y + new_height // 2, height)
     return image[y1:y2, x1:x2]
 
 def exclude_scaling_box(image: np.ndarray, bbox: np.ndarray, orig_size: tuple, processed_size: tuple, expansion_factor: float = 1.2) -> np.ndarray:
@@ -347,9 +347,9 @@ def save_dxf_spline(inflated_contours, scaling_factor, height, finger_clearance=
             print(f"Skipping contour: {e}")
     return doc, final_polygons_inch
 
-def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width, offset_unit, annotation_text=""):
+def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width, offset_unit, annotation_text="", image_height_in=None, image_width_in=None):
     msp = doc.modelspace()
-    # First, if unit is mm, check if values seem too low (accidental inches) and convert them.
+    # Convert from mm if necessary.
     if offset_unit.lower() == "mm":
         if boundary_length < 50:
             boundary_length = boundary_length * 25.4
@@ -361,7 +361,7 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
         boundary_length_in = boundary_length
         boundary_width_in = boundary_width
 
-    # Compute bounding box from inner contours.
+    # Compute bounding box of inner contours.
     min_x = float("inf")
     min_y = float("inf")
     max_x = -float("inf")
@@ -376,28 +376,34 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
         print("No tool polygons found, skipping boundary.")
         return None
 
-    # Calculate inner bounding box dimensions.
+    # Compute inner bounding box dimensions.
     inner_width = max_x - min_x
     inner_length = max_y - min_y
 
     # Set clearance margins.
-    clearance_side = 0.25    # Left and right clearance
-    clearance_top = 0.25     # Top clearance
-    # Bottom clearance: 0.75 if annotation text is provided; otherwise 0.25.
-    clearance_bottom = 0.75 if annotation_text.strip() else 0.25
-
-    # New check: if the provided boundary dimensions are too small relative to the inner contours, raise an error.
-    if boundary_width_in <= inner_width + 2 * clearance_side or \
-       boundary_length_in <= inner_length + clearance_top + clearance_bottom:
+    clearance_side = 0.25  # left/right clearance
+    clearance_tb = 0.25    # top/bottom clearance
+    if annotation_text.strip():
+        clearance_tb = 0.75
+
+    # Check if the boundary dimensions are at least larger than the inner box plus clearance.
+    if boundary_width_in <= inner_width + 2 * clearance_side or boundary_length_in <= inner_length + 2 * clearance_tb:
         raise BoundaryOverlapError("Error: The specified boundary dimensions are too small and overlap with the inner contours. Please provide larger values.")
 
-    # Compute the boundary rectangle centered on the inner contours.
-    shape_cx = (min_x + max_x) / 2
-    left = shape_cx - boundary_width_in / 2
-    right = shape_cx + boundary_width_in / 2
-    # Align bottom to inner bounding box with the desired bottom clearance.
-    bottom = min_y - clearance_bottom
-    top = bottom + boundary_length_in
+    # Check if boundary exceeds image limits (for example, 1 inch less than the image dimensions).
+    if image_height_in is not None and image_width_in is not None:
+        if boundary_length_in > (image_height_in - 1) or boundary_width_in > (image_width_in - 1):
+            raise BoundaryExceedsError("Error: The specified boundary dimensions exceed the allowed image dimensions. Please enter smaller values.")
+
+    # Calculate the center of the inner contours.
+    center_x = (min_x + max_x) / 2
+    center_y = (min_y + max_y) / 2
+
+    # Draw rectangle centered at (center_x, center_y).
+    left = center_x - boundary_width_in / 2
+    right = center_x + boundary_width_in / 2
+    bottom = center_y - boundary_length_in / 2
+    top = center_y + boundary_length_in / 2
 
     rect_coords = [(left, bottom), (right, bottom), (right, top), (left, top), (left, bottom)]
     from shapely.geometry import Polygon as ShapelyPolygon
@@ -449,11 +455,11 @@ def predict(
             except Exception:
                 raise ValueError("Invalid base64 image data")
 
-    # Apply sharpness enhancement.
+    # Apply brightness and sharpness enhancement.
     if isinstance(image, np.ndarray):
         pil_image = Image.fromarray(image)
-        Bright = ImageEnhance.Brightness(pil_image).enhance(0.5) 
-        enhanced_image = ImageEnhance.Sharpness(Bright).enhance(0.5)                                                    
+        Bright = ImageEnhance.Brightness(pil_image).enhance(1) 
+        enhanced_image = ImageEnhance.Sharpness(Bright).enhance(0.5)
         image = np.array(enhanced_image)
 
     # ---------------------
@@ -607,7 +613,14 @@ def predict(
     boundary_polygon = None
     if add_boundary.lower() == "yes":
         boundary_polygon = add_rectangular_boundary(
-            doc, final_polygons_inch, boundary_length, boundary_width, offset_unit, annotation_text
+            doc,
+            final_polygons_inch,
+            boundary_length,
+            boundary_width,
+            offset_unit,
+            annotation_text,
+            image_height_in=shrunked_img.shape[0] * scaling_factor,
+            image_width_in=shrunked_img.shape[1] * scaling_factor
         )
         if boundary_polygon is not None:
             final_polygons_inch.append(boundary_polygon)
@@ -619,11 +632,8 @@ def predict(
     # ---------------------
     msp = doc.modelspace()
     if annotation_text.strip():
-        # Use the inner contours bounding box computed earlier.
         text_x = (inner_min_x + inner_max_x) / 2.0  
         text_height_dxf = 0.5  
-        # Place the text so that its top edge is 0.125 inches below the inner tool contour.
-        # Since text height is 0.5 inches, the baseline is at inner_min_y - 0.125 - text_height_dxf.
         text_y_dxf = inner_min_y - 0.125 - text_height_dxf  
         text_entity = msp.add_text(
             annotation_text.strip(),
@@ -647,16 +657,10 @@ def predict(
     draw_polygons_inch(final_polygons_inch, new_outlines, scaling_factor, processed_size[0], color=(0, 0, 255), thickness=2)
 
     if annotation_text.strip():
-        # Use the same logic as DXF:
-        # Text is 0.5 inches high, and its baseline is at inner_min_y - 0.125 - 0.5.
-        text_height_cv = 0.5  # logical height in inches
-        # Calculate horizontal center (in inches) and convert to pixels
+        text_height_cv = 0.5
         text_x_img = int(((inner_min_x + inner_max_x) / 2.0) / scaling_factor)
-        # Baseline position in inches:
         text_y_in = inner_min_y - 0.125 - text_height_cv  
-        # Convert the baseline from inches to pixel coordinate
         text_y_img = int(processed_size[0] - (text_y_in / scaling_factor))
-        # Shift left to center the text approximately
         org = (text_x_img - int(len(annotation_text.strip()) * 6), text_y_img)
 
         cv2.putText(
@@ -664,7 +668,7 @@ def predict(
             annotation_text.strip(),
             org,
             cv2.FONT_HERSHEY_SIMPLEX,
-            1.3,          # scale factor
+            1.3,
             (0, 0, 255),
             3,
             cv2.LINE_AA