Update app.py

app.py

@@ -9,6 +9,11 @@ import numpy as np
 import torch
 import cv2
 import ezdxf
+from ezdxf.addons.text2path import make_paths_from_str
+from ezdxf import path
+from ezdxf.addons import text2path
+from ezdxf.enums import TextEntityAlignment
+from ezdxf.fonts.fonts import FontFace,get_font_face
 import gradio as gr
 from PIL import Image, ImageEnhance
 from pathlib import Path
@@ -45,6 +50,10 @@ class BoundaryOverlapError(Exception):
     """Raised when the optional boundary dimensions are too small and overlap with the inner contours."""
     pass
 
+class TextOverlapError(Exception):
+    """Raised when the text overlaps with the inner contours (with a margin of 0.75)."""
+    pass
+
 # ---------------------
 # Global Model Initialization with caching and print statements
 # ---------------------
@@ -146,7 +155,7 @@ def yolo_detect(image: Union[str, Path, int, Image.Image, list, tuple, np.ndarra
 
 def detect_reference_square(img: np.ndarray):
     t = time.time()
-    res = reference_detector_global.predict(img, conf=0.35)
+    res = reference_detector_global.predict(img, conf=0.05)
     if not res or len(res) == 0 or len(res[0].boxes) == 0:
         raise ReferenceBoxNotDetectedError("Reference box not detected in the image.")
     print("Reference detection completed in {:.2f} seconds".format(time.time() - t))
@@ -383,8 +392,9 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
         clearance_tb = 0.75
 
     # Check if boundary dimensions are at least larger than 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.")
+    # 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.")
+   
 
     # Calculate center of inner contours
     center_x = (min_x + max_x) / 2
@@ -400,6 +410,11 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
     from shapely.geometry import Polygon as ShapelyPolygon
     boundary_polygon = ShapelyPolygon(rect_coords)
     msp.add_lwpolyline(rect_coords, close=True, dxfattribs={"layer": "BOUNDARY"})
+    
+    text_top=boundary_polygon.bounds[1] + 1
+    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):
@@ -618,19 +633,40 @@ def predict(
     # 8) Add annotation text (if provided) in the DXF
     # ---------------------
     msp = doc.modelspace()
+    
     if annotation_text.strip():
+        
         text_x = ((inner_min_x + inner_max_x) / 2.0) - (int(len(annotation_text.strip()) / 2.0))
-        text_height_dxf = 0.5  
-        text_y_dxf = inner_min_y - 0.125 - text_height_dxf  
-        text_entity = msp.add_text(
-            annotation_text.strip(),
-            dxfattribs={
-                "height": text_height_dxf,
-                "layer": "ANNOTATION",
-                "style": "Bold"
-            }
+        text_height_dxf = 0.75  
+        text_y_dxf = boundary_polygon.bounds[1] + 0.25 #+ text_height_dxf#inner_min_y - 0.125 - text_height_dxf  
+        # text_entity = msp.add_text(
+        #     annotation_text.strip().upper(),
+        #     dxfattribs={
+        #         "height": text_height_dxf,
+        #         "layer": "ANNOTATION",
+        #         "style": "Simplex",
+        #     }   
+        # )
+        # text_entity.dxf.insert = (text_x, text_y_dxf)
+        font = get_font_face("Arial")
+        paths = text2path.make_paths_from_str(
+            annotation_text.strip().upper(),
+            font=font,  # Use default font
+            size=text_height_dxf,
+            align=TextEntityAlignment.LEFT
+        )
+        
+        # Create a translation matrix
+        translation = ezdxf.math.Matrix44.translate(text_x, text_y_dxf, 0)
+            # Apply the translation to each path
+        translated_paths = [p.transform(translation) for p in paths]
+    
+        # Render the paths as splines and polylines
+        path.render_splines_and_polylines(
+            msp, 
+            translated_paths, 
+            dxfattribs={"layer": "ANNOTATION", "color": 7}
         )
-        text_entity.dxf.insert = (text_x, text_y_dxf)
 
     # Save the DXF
     dxf_filepath = os.path.join("./outputs", "out.dxf")
@@ -643,31 +679,109 @@ def predict(
     new_outlines = np.ones_like(output_img) * 255
     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.75
+    #     text_x_img = int(((inner_min_x + inner_max_x) / 2.0) / scaling_factor)
+    #     text_y_in =  boundary_polygon.bounds[1] + 0.25 #+ text_height_cv#inner_min_y - 0.125 - text_height_cv  
+    #     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)
+
+    #     cv2.putText(
+    #         output_img,
+    #         annotation_text.strip().upper(),
+    #         org,
+    #         cv2.FONT_HERSHEY_SIMPLEX,
+    #         1.2,
+    #         (0, 0, 255),
+    #         2,
+    #         cv2.LINE_AA
+    #     )
+    #     cv2.putText(
+    #         new_outlines,
+    #         annotation_text.strip().upper(),
+    #         org,
+    #         cv2.FONT_HERSHEY_SIMPLEX,
+    #         1.2,
+    #         (0, 0, 255),
+    #         2,
+    #         cv2.LINE_AA
+    #     )
     if annotation_text.strip():
-        text_height_cv = 0.50
+        text_height_cv = 0.75
         text_x_img = int(((inner_min_x + inner_max_x) / 2.0) / scaling_factor)
-        text_y_in = inner_min_y - 0.125 - text_height_cv  
+        text_y_in = boundary_polygon.bounds[1] + 0.25
         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)
 
+        # Method 2: Use two different thicknesses
+        # Draw thicker outline
+        # Create a clean temporary image for drawing the text outline
+        temp_img = np.zeros_like(output_img)
+
+        # Draw thick text on temp image
         cv2.putText(
-            output_img,
-            annotation_text.strip(),
+            temp_img,
+            annotation_text.strip().upper(),
+            org,
+            cv2.FONT_HERSHEY_SIMPLEX,
+            2,
+            (0, 0, 255),  # Red color
+            4,  # Thicker outline
+            cv2.LINE_AA
+        )
+
+        # Draw inner text in black on temp image
+        cv2.putText(
+            temp_img,
+            annotation_text.strip().upper(),
+            org,
+            cv2.FONT_HERSHEY_SIMPLEX,
+            2,
+            (0, 0, 0),  # Black to create hole
+            2,  # Thinner inner part
+            cv2.LINE_AA
+        )
+
+        # Create a mask from the temp image
+        outline_mask = cv2.cvtColor(temp_img, cv2.COLOR_BGR2GRAY)
+        _, outline_mask = cv2.threshold(outline_mask, 1, 255, cv2.THRESH_BINARY)
+
+        # Apply only the red channel from the temp image to the output image
+        # This preserves the original background where the outline isn't
+        output_img[outline_mask > 0] = temp_img[outline_mask > 0]
+                
+        # Draw inner part with background color
+        # cv2.putText(
+        #     output_img,
+        #     annotation_text.strip().upper(),
+        #     org,
+        #     cv2.FONT_HERSHEY_SIMPLEX,
+        #     2,
+        #     (255, 255, 255),  # Assuming black background, adjust as needed
+        #     2,  # Thinner inner part
+        #     cv2.LINE_AA
+        # )
+        
+        # Do the same for new_outlines
+        cv2.putText(
+            new_outlines,
+            annotation_text.strip().upper(),
             org,
             cv2.FONT_HERSHEY_SIMPLEX,
-            1.2,
-            (0, 0, 255),
             2,
+            (0, 0, 255),  # Red color
+            4,  # Thicker outline
             cv2.LINE_AA
         )
+        
         cv2.putText(
             new_outlines,
-            annotation_text.strip(),
+            annotation_text.strip().upper(),
             org,
             cv2.FONT_HERSHEY_SIMPLEX,
-            1.2,
-            (0, 0, 255),
             2,
+            (255, 255, 255),  # Assuming black background, adjust as needed
+            2,  # Thinner inner part
             cv2.LINE_AA
         )
 
@@ -716,5 +830,4 @@ if __name__ == "__main__":
             ["./Test21.jpg", 0.075, "inches", "Yes", "Yes", 300.0, 200.0, "Tool2"]
         ]
     )
-    iface.launch(share=True)
-    
+    iface.launch(share=True)