python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 03:18:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

add textbbox and textlength to ImageDraw2 and update tests

Browse Source
This commit is contained in:
nulano 2022-05-25 22:00:13 +01:00
parent f34a6460ef
commit 1bf87556ef
No known key found for this signature in database
GPG Key ID: B650CDF63B705766
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/test_imagedraw.py
View File

@ -1239,7 +1239,7 @@ def test_textsize_empty_string():
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")
def test_textsize_stroke(): def test_textbbox_stroke():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)

13
Tests/test_imagedraw2.py
View File

@ -1,5 +1,7 @@
import os.path import os.path
import pytest
from PIL import Image, ImageDraw, ImageDraw2 from PIL import Image, ImageDraw, ImageDraw2
from .helper import ( from .helper import (
@ -205,7 +207,9 @@ def test_textsize():
font = ImageDraw2.Font("white", FONT_PATH) font = ImageDraw2.Font("white", FONT_PATH)
# Act # Act
size = draw.textsize("ImageDraw2", font) with pytest.warns(DeprecationWarning) as log:
size = draw.textsize("ImageDraw2", font)
assert len(log) == 1
# Assert # Assert
assert size[1] == 12 assert size[1] == 12
@ -221,9 +225,10 @@ def test_textsize_empty_string():
# Act # Act
# Should not cause 'SystemError: <built-in method getsize of # Should not cause 'SystemError: <built-in method getsize of
# ImagingFont object at 0x...> returned NULL without setting an error' # ImagingFont object at 0x...> returned NULL without setting an error'
draw.textsize("", font) draw.textbbox((0, 0), "", font)
draw.textsize("\n", font) draw.textbbox((0, 0), "\n", font)
draw.textsize("test\n", font) draw.textbbox((0, 0), "test\n", font)
draw.textlength("", font)
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")

26
src/PIL/ImageDraw2.py
View File

@ -25,6 +25,7 @@
from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath
from ._deprecate import deprecate
class Pen: class Pen:
@ -176,4 +177,27 @@ class Draw:
.. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textsize` .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textsize`
""" """
return self.draw.textsize(text, font=font.font) deprecate("textsize", 10, "textbbox or textlength")
return self.draw.textsize(text, font=font.font, __internal__=True)
def textbbox(self, xy, text, font):
"""
Returns bounding box (in pixels) of given text.
:return: ``(left, top, right, bottom)`` bounding box
.. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textbbox`
"""
if self.transform:
xy = ImagePath.Path(xy)
xy.transform(self.transform)
return self.draw.textbbox(xy, text, font=font.font)
def textlength(self, text, font):
"""
Returns length (in pixels) of given text.
This is the amount by which following text should be offset.
.. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textlength`
"""
return self.draw.textlength(text, font=font.font)