xclele/yolov10
1
0
Fork 0
mirror of https://github.com/THU-MIG/yolov10.git synced 2025-05-24 05:55:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

OBB: Fix plot_images (#7592)

Browse Source
This commit is contained in:
Laughing 2024-01-15 21:33:30 +08:00 committed by GitHub
parent 2f11ab5e6f
commit cf50bd9b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ultralytics/models/yolo/obb/val.py
View File

@ -117,11 +117,10 @@ class OBBValidator(DetectionValidator):
def save_one_txt(self, predn, save_conf, shape, file): def save_one_txt(self, predn, save_conf, shape, file):
"""Save YOLO detections to a txt file in normalized coordinates in a specific format.""" """Save YOLO detections to a txt file in normalized coordinates in a specific format."""
gn = torch.tensor(shape)[[1, 0, 1, 0]] # normalization gain whwh gn = torch.tensor(shape)[[1, 0]] # normalization gain whwh
for *xyxy, conf, cls, angle in predn.tolist(): for *xywh, conf, cls, angle in predn.tolist():
xywha = torch.tensor([*xyxy, angle]).view(1, 5) xywha = torch.tensor([*xywh, angle]).view(1, 5)
xywha[:, :4] /= gn xyxyxyxy = (ops.xywhr2xyxyxyxy(xywha) / gn).view(-1).tolist() # normalized xywh
xyxyxyxy = ops.xywhr2xyxyxyxy(xywha).view(-1).tolist() # normalized xywh
line = (cls, *xyxyxyxy, conf) if save_conf else (cls, *xyxyxyxy) # label format line = (cls, *xyxyxyxy, conf) if save_conf else (cls, *xyxyxyxy) # label format
with open(file, "a") as f: with open(file, "a") as f:
f.write(("%g " * len(line)).rstrip() % line + "\n") f.write(("%g " * len(line)).rstrip() % line + "\n")

8
ultralytics/utils/ops.py
View File

@ -541,7 +541,7 @@ def xyxyxyxy2xywhr(corners):
) # rboxes ) # rboxes
def xywhr2xyxyxyxy(center): def xywhr2xyxyxyxy(rboxes):
""" """
Convert batched Oriented Bounding Boxes (OBB) from [xywh, rotation] to [xy1, xy2, xy3, xy4]. Rotation values should Convert batched Oriented Bounding Boxes (OBB) from [xywh, rotation] to [xy1, xy2, xy3, xy4]. Rotation values should
be in degrees from 0 to 90. be in degrees from 0 to 90.
@ -552,11 +552,11 @@ def xywhr2xyxyxyxy(center):
Returns: Returns:
(numpy.ndarray | torch.Tensor): Converted corner points of shape (n, 4, 2) or (b, n, 4, 2). (numpy.ndarray | torch.Tensor): Converted corner points of shape (n, 4, 2) or (b, n, 4, 2).
""" """
is_numpy = isinstance(center, np.ndarray) is_numpy = isinstance(rboxes, np.ndarray)
cos, sin = (np.cos, np.sin) if is_numpy else (torch.cos, torch.sin) cos, sin = (np.cos, np.sin) if is_numpy else (torch.cos, torch.sin)
ctr = center[..., :2] ctr = rboxes[..., :2]
w, h, angle = (center[..., i : i + 1] for i in range(2, 5)) w, h, angle = (rboxes[..., i : i + 1] for i in range(2, 5))
cos_value, sin_value = cos(angle), sin(angle) cos_value, sin_value = cos(angle), sin(angle)
vec1 = [w / 2 * cos_value, w / 2 * sin_value] vec1 = [w / 2 * cos_value, w / 2 * sin_value]
vec2 = [-h / 2 * sin_value, h / 2 * cos_value] vec2 = [-h / 2 * sin_value, h / 2 * cos_value]

16
ultralytics/utils/plotting.py
View File

@ -706,16 +706,16 @@ def plot_images(
if len(bboxes): if len(bboxes):
boxes = bboxes[idx] boxes = bboxes[idx]
conf = confs[idx] if confs is not None else None # check for confidence presence (label vs pred) conf = confs[idx] if confs is not None else None # check for confidence presence (label vs pred)
if len(boxes):
if boxes[:, :4].max() <= 1.1: # if normalized with tolerance 0.1
boxes[:, [0, 2]] *= w # scale to pixels
boxes[:, [1, 3]] *= h
elif scale < 1: # absolute coords need scale if image scales
boxes[:, :4] *= scale
boxes[:, 0] += x
boxes[:, 1] += y
is_obb = boxes.shape[-1] == 5 # xywhr is_obb = boxes.shape[-1] == 5 # xywhr
boxes = ops.xywhr2xyxyxyxy(boxes) if is_obb else ops.xywh2xyxy(boxes) boxes = ops.xywhr2xyxyxyxy(boxes) if is_obb else ops.xywh2xyxy(boxes)
if len(boxes):
if boxes[:, :4].max() <= 1.1: # if normalized with tolerance 0.1
boxes[..., 0::2] *= w # scale to pixels
boxes[..., 1::2] *= h
elif scale < 1: # absolute coords need scale if image scales
boxes[..., :4] *= scale
boxes[..., 0::2] += x
boxes[..., 1::2] += y
for j, box in enumerate(boxes.astype(np.int64).tolist()): for j, box in enumerate(boxes.astype(np.int64).tolist()):
c = classes[j] c = classes[j]
color = colors(c) color = colors(c)