Update app.py

app.py

@@ -452,7 +452,7 @@ def predict(
     # Apply sharpness enhancement.
     if isinstance(image, np.ndarray):
         pil_image = Image.fromarray(image)
-        enhanced_image = ImageEnhance.Sharpness(pil_image).enhance(2)
+        enhanced_image = ImageEnhance.Sharpness(pil_image).enhance(1.5)
         image = np.array(enhanced_image)
 
     # ---------------------
@@ -586,6 +586,20 @@ def predict(
     gc.collect()
     print("DXF generation completed in {:.2f} seconds".format(time.time() - t))
 
+    # ---------------------
+    # Compute bounding box of inner tool contours BEFORE adding optional boundary
+    # ---------------------
+    inner_min_x = float("inf")
+    inner_min_y = float("inf")
+    inner_max_x = -float("inf")
+    inner_max_y = -float("inf")
+    for poly in final_polygons_inch:
+        b = poly.bounds
+        inner_min_x = min(inner_min_x, b[0])
+        inner_min_y = min(inner_min_y, b[1])
+        inner_max_x = max(inner_max_x, b[2])
+        inner_max_y = max(inner_max_y, b[3])
+
     # ---------------------
     # 7) Add optional rectangular boundary (with the 0.75 bottom margin if annotation text is provided)
     # ---------------------
@@ -597,39 +611,19 @@ def predict(
         if boundary_polygon is not None:
             final_polygons_inch.append(boundary_polygon)
 
-    # Compute bounding box of all polygons to know where to place text
-    min_x = float("inf")
-    min_y = float("inf")
-    max_x = -float("inf")
-    max_y = -float("inf")
-    for poly in final_polygons_inch:
-        b = poly.bounds
-        if b[0] < min_x:
-            min_x = b[0]
-        if b[1] < min_y:
-            min_y = b[1]
-        if b[2] > max_x:
-            max_x = b[2]
-        if b[3] > max_y:
-            max_y = b[3]
-
     # ---------------------
     # 8) Add annotation text (if provided) in the DXF
     #    - Text is 0.5 inches high
-    #    - Placed so that there is 0.125 inch ABOVE min_y
+    #    - Placed so that its top edge is 0.125 inches below the inner tools' contour
     # ---------------------
     msp = doc.modelspace()
     if annotation_text.strip():
-        text_x = (min_x + max_x) / 2.0  # horizontally centered
-        text_height_dxf = 0.5
-
-        # If boundary is "yes", we'll place the baseline right above the min_y (0.125 above)
-        if add_boundary.lower() == "yes":
-            text_y_dxf = min_y + 0.125
-        else:
-            # If no boundary, place it 0.125 above the min_y
-            text_y_dxf = min_y - 0.125
-
+        # 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(),
             dxfattribs={
@@ -652,16 +646,17 @@ 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():
-        text_height_cv = 0.5  # same "logical" height in inches
-        if add_boundary.lower() == "yes":
-            text_y_in = min_y + 0.125
-        else:
-            text_y_in = min_y + 0.125
-
-        # Convert to pixel coords
-        text_px = int(((min_x + max_x) / 2.0) / scaling_factor)
-        text_py = int(processed_size[0] - (text_y_in / scaling_factor))
-        org = (text_px - int(len(annotation_text.strip()) * 6), text_py)  # shift left so text is centered
+        # 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_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(
             output_img,