bbox dino test

app.py

@@ -46,7 +46,7 @@ class DetectionResult:
             )
         )
 
-def annotate_with_transparency(image: Union[Image.Image, np.ndarray], detection_results: List[DetectionResult]) -> np.ndarray:
+def annotate(image: Union[Image.Image, np.ndarray], detection_results: List[DetectionResult]) -> np.ndarray:
     image_cv2 = np.array(image) if isinstance(image, Image.Image) else image
     image_cv2 = cv2.cvtColor(image_cv2, cv2.COLOR_RGB2BGR)
 
@@ -55,27 +55,24 @@ def annotate_with_transparency(image: Union[Image.Image, np.ndarray], detection_
         score = detection.score
         box = detection.box
         mask = detection.mask
-        color = np.random.randint(0, 256, size=3).tolist()
+        color = (255, 255, 255)  # White color for bounding boxes and text
 
-        if mask is not None:
-            mask_uint8 = (mask * 255).astype(np.uint8)
-            contours, _ = cv2.findContours(mask_uint8, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
-            
-            # Create an overlay with transparent background
-            overlay = image_cv2.copy()
-            cv2.drawContours(overlay, contours, -1, color, -1)  # Draw filled contours on the overlay
-
-            # Blend the overlay with the original image
-            alpha = 0.1  # Adjust the alpha value to control transparency
-            image_cv2 = cv2.addWeighted(overlay, alpha, image_cv2, 1 - alpha, 0)
+        # Draw the bounding box with a white border and filling
+        cv2.rectangle(image_cv2, (box.xmin, box.ymin), (box.xmax, box.ymax), color, -1)  # Filled white rectangle
+        cv2.rectangle(image_cv2, (box.xmin, box.ymin), (box.xmax, box.ymax), color, 2)  # Border
 
         cv2.putText(image_cv2, f'{label}: {score:.2f}', (box.xmin, box.ymin - 10),
                     cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2)
 
+        if mask is not None:
+            mask_uint8 = (mask * 255).astype(np.uint8)
+            contours, _ = cv2.findContours(mask_uint8, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+            cv2.drawContours(image_cv2, contours, -1, color, 2)
+
     return cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
 
 def plot_detections(image: Union[Image.Image, np.ndarray], detections: List[DetectionResult]) -> np.ndarray:
-    annotated_image = annotate_with_transparency(image, detections)
+    annotated_image = annotate(image, detections)
     return annotated_image
 
 def load_image(image: Union[str, Image.Image]) -> Image.Image: