Merge pull request #175 from wkentaro/fix/text-in-rectangle-lb-align

fix: align lb/lb- text to rectangle left edge in text_in_rectangle

Author: wkentaro

imgviz/draw/_text_in_rectangle.py

@@ -63,9 +63,9 @@ def text_in_rectangle_aabb(
     elif loc == "rt+":
         yx = (y1 - tsize[0] - 2, x2 - tsize[1] - 2)
     elif loc == "lb":
-        yx = (y2 - tsize[0] - 2, 0)
+        yx = (y2 - tsize[0] - 2, x1)
     elif loc == "lb-":
-        yx = (y2, 0)
+        yx = (y2, x1)
     elif loc == "rb":
         yx = (y2 - tsize[0] - 2, x2 - tsize[1] - 2)
     elif loc == "rb-":

tests/unit/draw/_text_in_rectangle_test.py

@@ -1,4 +1,7 @@
+from typing import Literal
+
 import numpy as np
+import pytest
 
 import imgviz
 
@@ -15,3 +18,31 @@ def test_text_in_rectangle() -> None:
     assert res.shape == img.shape
     assert res.dtype == np.uint8
     assert not np.array_equal(res, img)
+
+
+@pytest.mark.parametrize("loc", ["lt", "lt+", "lb", "lb-"])
+def test_text_in_rectangle_aabb_left_aligns_to_x1(
+    loc: Literal["lt", "lt+", "lb", "lb-"],
+) -> None:
+    yx1 = (20, 50)
+    yx2 = (80, 150)
+
+    aabb = imgviz.draw.text_in_rectangle_aabb(
+        yx1=yx1, yx2=yx2, loc=loc, text="Hi", size=10
+    )
+
+    assert aabb.x1 == yx1[1]
+
+
+@pytest.mark.parametrize("loc", ["rt", "rt+", "rb", "rb-"])
+def test_text_in_rectangle_aabb_right_aligns_to_x2(
+    loc: Literal["rt", "rt+", "rb", "rb-"],
+) -> None:
+    yx1 = (20, 50)
+    yx2 = (80, 150)
+
+    aabb = imgviz.draw.text_in_rectangle_aabb(
+        yx1=yx1, yx2=yx2, loc=loc, text="Hi", size=10
+    )
+
+    assert aabb.x2 == yx2[1] - 1  # text right edge sits one pixel inside x2