Fix Annotator tuples>lists (#20242)

Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
Glenn Jocher 2025-04-20 16:14:34 +02:00 committed by GitHub
parent 89d91cf397
commit 47e31e24cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 13 deletions

View File

@ -102,16 +102,12 @@ def is_ascii(s) -> bool:
Check if a string is composed of only ASCII characters.
Args:
s (str): String to be checked.
s (str | list | tuple | dict): Input to be checked (all are converted to string for checking).
Returns:
(bool): True if the string is composed only of ASCII characters, False otherwise.
"""
# Convert list, tuple, None, etc. to string
s = str(s)
# Check if the string is composed of only ASCII characters
return all(ord(c) < 128 for c in s)
return all(ord(c) < 128 for c in str(s))
def check_imgsz(imgsz, stride=32, min_dim=1, max_dim=2, floor=0):

View File

@ -309,7 +309,7 @@ class Annotator:
(p1[0], p1[1] - h if outside else p1[1], p1[0] + w + 1, p1[1] + 1 if outside else p1[1] + h + 1),
fill=color,
)
# self.draw.text((box[0], box[1]), label, fill=txt_color, font=self.font, anchor='ls') # for PIL>8.0
# self.draw.text([box[0], box[1]], label, fill=txt_color, font=self.font, anchor='ls') # for PIL>8.0
self.draw.text((p1[0], p1[1] - h if outside else p1[1]), label, fill=txt_color, font=self.font)
else: # cv2
if rotated:
@ -448,10 +448,10 @@ class Annotator:
anchor (str, optional): Text anchor position ('top' or 'bottom').
box_color (tuple, optional): Box color (R, G, B, A) with optional alpha.
"""
if anchor == "bottom": # start y from font bottom
w, h = self.font.getsize(text)
xy[1] += 1 - h
if self.pil:
w, h = self.font.getsize(text)
if anchor == "bottom": # start y from font bottom
xy[1] += 1 - h
for line in text.split("\n"):
if box_color:
# Draw rectangle for each line
@ -706,12 +706,12 @@ def plot_images(
# Annotate
fs = int((h + w) * ns * 0.01) # font size
fs = max(fs, 18) # ensure that the font size is large enough to be easily readable.
annotator = Annotator(mosaic, line_width=round(fs / 10), font_size=fs, pil=True, example=names)
annotator = Annotator(mosaic, line_width=round(fs / 10), font_size=fs, pil=True, example=str(names))
for i in range(bs):
x, y = int(w * (i // ns)), int(h * (i % ns)) # block origin
annotator.rectangle([x, y, x + w, y + h], None, (255, 255, 255), width=2) # borders
if paths:
annotator.text((x + 5, y + 5), text=Path(paths[i]).name[:40], txt_color=(220, 220, 220)) # filenames
annotator.text([x + 5, y + 5], text=Path(paths[i]).name[:40], txt_color=(220, 220, 220)) # filenames
if len(cls) > 0:
idx = batch_idx == i
classes = cls[idx].astype("int")
@ -742,7 +742,7 @@ def plot_images(
for c in classes:
color = colors(c)
c = names.get(c, c) if names else c
annotator.text((x, y), f"{c}", txt_color=color, box_color=(64, 64, 64, 128))
annotator.text([x, y], f"{c}", txt_color=color, box_color=(64, 64, 64, 128))
# Plot keypoints
if len(kpts):