Update app.py

app.py

@@ -708,198 +708,6 @@ def draw_single_polygon(poly, image_rgb, scaling_factor, image_height, color=(0,
     pts_px = np.array(pts_px, dtype=np.int32)
     cv2.polylines(image_rgb, [pts_px], isClosed=True, color=color, thickness=thickness, lineType=cv2.LINE_AA)
 
-# def draw_and_pad(polygons_inch, scaling_factor,boundary_polygon, padding=50, 
-#                  color=(0,0,255), thickness=2):
-#     """
-#     - polygons_inch: list of Shapely Polygons in inch units (already including boundary).
-#     - scaling_factor: inches per pixel.
-#     - padding: padding in pixels.
-#     """
-#     all_x = []
-#     all_y = []
-#     pixel_polys = []
-    
-#     # 1) Convert to pixel coords and collect bounds
-#     for poly in polygons_inch:
-#         coords = list(poly.exterior.coords)
-#         pts = []
-#         for x_in, y_in in coords:
-#             px = int(round(x_in / scaling_factor))
-#             py = int(round(y_in / scaling_factor))
-#             pts.append([px, py])
-#             all_x.append(px)
-#             all_y.append(py)
-#         pixel_polys.append(np.array(pts, dtype=np.int32))
-    
-#     # 2) Compute canvas size
-    
-#     min_x, max_x = min(all_x), max(all_x)
-#     min_y, max_y = min(all_y), max(all_y)
-#     width  = max_x - min_x + 1
-#     height = max_y - min_y + 1
-    
-#     # 3) Create blank white canvas
-#     canvas = 255 * np.ones((height, width, 3), dtype=np.uint8)
-    
-#     # 4) Draw each polygon, flipping y within the local box
-#     for pts in pixel_polys:
-#         # Offset so min corner is (0,0)
-#         pts_off = pts - np.array([[min_x, min_y]])
-#         # Flip y: new_y = height-1 - old_y
-#         pts_off[:,1] = (height - 1) - pts_off[:,1]
-#         cv2.polylines(canvas, [pts_off], isClosed=True, 
-#                       color=color, thickness=thickness, lineType=cv2.LINE_AA)
-    
-#     # 5) Pad the canvas
-
-#         padded = cv2.copyMakeBorder(
-#             canvas,
-#             top=padding, bottom=padding,
-#             left=padding, right=padding,
-#             borderType=cv2.BORDER_CONSTANT,
-#             value=[255,255,255]
-#         )
-#     return padded
-
-# import numpy as np
-# import cv2
-
-# def draw_and_pad(polygons_inch, scaling_factor, boundary_polygon, padding=50,
-#                  color=(0,0,255), thickness=2):
-#     """
-#     - polygons_inch: list of Shapely Polygons in inch units.
-#     - scaling_factor: inches per pixel.
-#     - boundary_polygon: the Shapely boundary polygon, or None.
-#     - padding: base padding in pixels.
-#     """
-#     all_x, all_y = [], []
-#     pixel_polys = []
-    
-#     # 1) Convert to pixel coords and collect bounds
-#     for poly in polygons_inch:
-#         coords = list(poly.exterior.coords)
-#         pts = []
-#         for x_in, y_in in coords:
-#             px = int(round(x_in / scaling_factor))
-#             py = int(round(y_in / scaling_factor))
-#             pts.append([px, py])
-#             all_x.append(px)
-#             all_y.append(py)
-#         pixel_polys.append(np.array(pts, dtype=np.int32))
-    
-#     # 2) Compute canvas size
-#     min_x, max_x = min(all_x), max(all_x)
-#     min_y, max_y = min(all_y), max(all_y)
-#     width  = max_x - min_x + 1
-#     height = max_y - min_y + 1
-    
-#     # 3) Create blank white canvas
-#     canvas = 255 * np.ones((height, width, 3), dtype=np.uint8)
-    
-#     # 4) Draw each polygon, flipping y within the local box
-#     for pts in pixel_polys:
-#         pts_off = pts - np.array([[min_x, min_y]])
-#         pts_off[:,1] = (height - 1) - pts_off[:,1]
-#         cv2.polylines(canvas, [pts_off], isClosed=True, 
-#                       color=color, thickness=thickness, lineType=cv2.LINE_AA)
-    
-#     # 5) Decide padding amounts
-#     if boundary_polygon is not None:
-#         top = bottom = left = right = padding
-#     else:
-#         # Double the padding if there's no boundary, to avoid clipping
-#         top = bottom = left = right = padding * 2
-
-#     # 6) Pad the canvas
-#     padded = cv2.copyMakeBorder(
-#         canvas,
-#         top=top, bottom=bottom,
-#         left=left, right=right,
-#         borderType=cv2.BORDER_CONSTANT,
-#         value=[255,255,255]
-#     )
-#     return padded
-
-import numpy as np
-import cv2
-
-# def draw_and_pad(polygons_inch, scaling_factor, boundary_polygon, padding=50, 
-#                  color=(0, 0, 255), thickness=2):
-#     """
-#     Draws Shapely Polygons (in inch units) on a white canvas.
-    
-#     When boundary_polygon is None, the computed bounds are expanded by the padding value 
-#     so that the drawn contours are not clipped at the edges after adding the final padding.
-    
-#     Arguments:
-#         polygons_inch: list of Shapely Polygons in inch units (already including boundary).
-#         scaling_factor: inches per pixel.
-#         boundary_polygon: the Shapely boundary polygon, or None.
-#         padding: padding in pixels.
-#         color: color of the drawn polylines (in BGR format).
-#         thickness: line thickness.
-
-#     Returns:
-#         padded: an image (numpy array) of the drawn polygons with an external white border.
-#     """
-#     all_x = []
-#     all_y = []
-#     pixel_polys = []
-    
-#     # 1) Convert each polygon to pixel coordinates and compute overall bounds.
-#     for poly in polygons_inch:
-#         coords = list(poly.exterior.coords)
-#         pts = []
-#         for x_in, y_in in coords:
-#             px = int(round(x_in / scaling_factor))
-#             py = int(round(y_in / scaling_factor))
-#             pts.append([px, py])
-#             all_x.append(px)
-#             all_y.append(py)
-#         pixel_polys.append(np.array(pts, dtype=np.int32))
-    
-#     # 2) Compute the basic canvas size from the polygon bounds.
-#     min_x, max_x = min(all_x), max(all_x)
-#     min_y, max_y = min(all_y), max(all_y)
-    
-#     # If no boundary polygon is provided, expand the bounds to add margin
-#     # so that later when we pad externally, the contours do not get clipped.
-#     if boundary_polygon is None:
-#         min_x -= padding
-#         max_x += padding
-#         min_y -= padding
-#         max_y += padding
-
-#     width  = max_x - min_x + 1
-#     height = max_y - min_y + 1
-    
-#     # 3) Create a blank white canvas.
-#     canvas = 255 * np.ones((height, width, 3), dtype=np.uint8)
-    
-#     # 4) Draw each polygon, flipping the y-coordinates to match image coordinates.
-#     for pts in pixel_polys:
-#         # Offset so the minimum corner becomes (0,0) on canvas.
-#         pts_off = pts - np.array([[min_x, min_y]])
-#         # Flip y: image coordinates have (0,0) at the top-left.
-#         pts_off[:, 1] = (height - 1) - pts_off[:, 1]
-#         cv2.polylines(canvas, [pts_off], isClosed=True, 
-#                       color=color, thickness=thickness, lineType=cv2.LINE_AA)
-    
-#     # 5) Finally, add external padding on all sides.
-#     padded = cv2.copyMakeBorder(
-#         canvas,
-#         top=padding, bottom=padding,
-#         left=padding, right=padding,
-#         borderType=cv2.BORDER_CONSTANT,
-#         value=[255, 255, 255]
-#     )
-    
-#     return padded
-
-import numpy as np
-import cv2
-from shapely.geometry import Polygon
-
 import numpy as np
 import cv2
 from shapely.geometry import Polygon
@@ -1211,7 +1019,7 @@ def predict(
     # ---------------------
     # 9) For the preview images, draw the polygons and place text similarly
     # ---------------------
-    #draw_polygons_inch(final_polygons_inch, output_img, scaling_factor, processed_size[0], color=(0, 0, 255), thickness=2)
+   
     for poly in final_polygons_inch:
     # Skip the boundary polygon
         if boundary_polygon is not None and poly == boundary_polygon:
@@ -1219,7 +1027,7 @@ def predict(
         draw_single_polygon(poly, output_img, scaling_factor, processed_size[0], color=(0, 0, 255), thickness=2)
     new_outlines,preview_scale, off_y, padding_px, PH= draw_and_pad(final_polygons_inch, scaling_factor,boundary_polygon)
 
-    #draw_polygons_inch(final_polygons_inch, new_outlines, scaling_factor, processed_size[0], color=(0, 0, 255), thickness=2)
+    
     import math
     if annotation_text.strip():
         # Common variables
@@ -1255,9 +1063,7 @@ def predict(
             y1          = raw_y - off_y + padding_px
             text_y_px   = int(round(PH - 1 - y1))
             text_y_px_adjusted = text_y_px - baseline
-            # bottom_margin_px = int(0.25 / scaling_factor)
-            # font_scale,_ = optimal_font_dims(new_outlines)
-            #text_y_outlines = int(canvas_height - (text_y_in + (0.75) / scaling_factor))
+        
             
             # First outline, then inner text
             cv2.putText(new_outlines, text, (text_x, text_y_px_adjusted), font, font_scale, (0, 0, 255), thickness+2, cv2.LINE_AA)