HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Adjust box labels on right image side (#13959)

Browse source 
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
jackwolfey 2024-06-26 01:45:30 +08:00 • committed by GitHub
parent be1722b4b8
commit b11f043e1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ultralytics/utils/plotting.py
View file

@ -290,14 +290,15 @@ class Annotator:
if self.pil or not is_ascii(label): if self.pil or not is_ascii(label):
if rotated: if rotated:
p1 = box[0] p1 = box[0]
# NOTE: PIL-version polygon needs tuple type. self.draw.polygon([tuple(b) for b in box], width=self.lw, outline=color) # PIL requires tuple box
self.draw.polygon([tuple(b) for b in box], width=self.lw, outline=color)
else: else:
p1 = (box[0], box[1]) p1 = (box[0], box[1])
self.draw.rectangle(box, width=self.lw, outline=color) # box self.draw.rectangle(box, width=self.lw, outline=color) # box
if label: if label:
w, h = self.font.getsize(label) # text width, height w, h = self.font.getsize(label) # text width, height
outside = p1[1] - h >= 0 # label fits outside box outside = p1[1] >= h # label fits outside box
if p1[0] > self.im.size[1] - w: # check if label extend beyond right side of image
p1 = self.im.size[1] - w, p1[1]
self.draw.rectangle( self.draw.rectangle(
(p1[0], p1[1] - h if outside else p1[1], p1[0] + w + 1, p1[1] + 1 if outside else p1[1] + h + 1), (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, fill=color,
@ -307,20 +308,22 @@ class Annotator:
else: # cv2 else: # cv2
if rotated: if rotated:
p1 = [int(b) for b in box[0]] p1 = [int(b) for b in box[0]]
# NOTE: cv2-version polylines needs np.asarray type. cv2.polylines(self.im, [np.asarray(box, dtype=int)], True, color, self.lw) # cv2 requires nparray box
cv2.polylines(self.im, [np.asarray(box, dtype=int)], True, color, self.lw)
else: else:
p1, p2 = (int(box[0]), int(box[1])), (int(box[2]), int(box[3])) p1, p2 = (int(box[0]), int(box[1])), (int(box[2]), int(box[3]))
cv2.rectangle(self.im, p1, p2, color, thickness=self.lw, lineType=cv2.LINE_AA) cv2.rectangle(self.im, p1, p2, color, thickness=self.lw, lineType=cv2.LINE_AA)
if label: if label:
w, h = cv2.getTextSize(label, 0, fontScale=self.sf, thickness=self.tf)[0] # text width, height w, h = cv2.getTextSize(label, 0, fontScale=self.sf, thickness=self.tf)[0] # text width, height
outside = p1[1] - h >= 3 h += 3 # add pixels to pad text
p2 = p1[0] + w, p1[1] - h - 3 if outside else p1[1] + h + 3 outside = p1[1] >= h # label fits outside box
if p1[0] > self.im.shape[1] - w: # check if label extend beyond right side of image
p1 = self.im.shape[1] - w, p1[1]
p2 = p1[0] + w, p1[1] - h if outside else p1[1] + h
cv2.rectangle(self.im, p1, p2, color, -1, cv2.LINE_AA) # filled cv2.rectangle(self.im, p1, p2, color, -1, cv2.LINE_AA) # filled
cv2.putText( cv2.putText(
self.im, self.im,
label, label,
(p1[0], p1[1] - 2 if outside else p1[1] + h + 2), (p1[0], p1[1] - 2 if outside else p1[1] + h - 1),
0, 0,
self.sf, self.sf,
txt_color, txt_color,
@ -441,8 +444,9 @@ class Annotator:
else: else:
if box_style: if box_style:
w, h = cv2.getTextSize(text, 0, fontScale=self.sf, thickness=self.tf)[0] # text width, height w, h = cv2.getTextSize(text, 0, fontScale=self.sf, thickness=self.tf)[0] # text width, height
outside = xy[1] - h >= 3 h += 3 # add pixels to pad text
p2 = xy[0] + w, xy[1] - h - 3 if outside else xy[1] + h + 3 outside = xy[1] >= h # label fits outside box
p2 = xy[0] + w, xy[1] - h if outside else xy[1] + h
cv2.rectangle(self.im, xy, p2, txt_color, -1, cv2.LINE_AA) # filled cv2.rectangle(self.im, xy, p2, txt_color, -1, cv2.LINE_AA) # filled
# Using `txt_color` for background and draw fg with white color # Using `txt_color` for background and draw fg with white color
txt_color = (255, 255, 255) txt_color = (255, 255, 255)