xiaoxue_admin
/
supervision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "spread_out" arg to "smart_positions"

This commit is contained in:
LinasKo 2024-11-08 13:07:34 +02:00
parent b66702c5ff
commit 5fedfe5220
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
supervision/annotators/core.py
View File

@ -1065,7 +1065,7 @@ class LabelAnnotator(BaseAnnotator):
text_position: Position = Position.TOP_LEFT,
color_lookup: ColorLookup = ColorLookup.CLASS,
border_radius: int = 0,
spread_out: bool = False,
smart_positions: bool = False,
):
"""
Args:
@ -1082,7 +1082,7 @@ class LabelAnnotator(BaseAnnotator):
Options are `INDEX`, `CLASS`, `TRACK`.
border_radius (int): The radius to apply round edges. If the selected
value is higher than the lower dimension, width or height, is clipped.
spread_out (bool): Spread out the labels to avoid overlapping.
smart_positions (bool): Spread out the labels to avoid overlapping.
"""
self.border_radius: int = border_radius
self.color: Union[Color, ColorPalette] = color
@ -1092,7 +1092,7 @@ class LabelAnnotator(BaseAnnotator):
self.text_padding: int = text_padding
self.text_anchor: Position = text_position
self.color_lookup: ColorLookup = color_lookup
self.spread_out = spread_out
self.smart_positions = smart_positions
@ensure_cv2_image_for_annotation
def annotate(
@ -1153,7 +1153,7 @@ class LabelAnnotator(BaseAnnotator):
detections, text_properties, self.text_anchor
)
if self.spread_out:
if self.smart_positions:
xyxy = spread_out_boxes(xyxy, step=2, max_iterations=len(xyxy) * 20)
self._draw_labels(
@ -1362,7 +1362,7 @@ class RichLabelAnnotator(BaseAnnotator):
text_position: Position = Position.TOP_LEFT,
color_lookup: ColorLookup = ColorLookup.CLASS,
border_radius: int = 0,
spread_out: bool = False,
smart_positions: bool = False,
):
"""
Args:
@ -1379,7 +1379,7 @@ class RichLabelAnnotator(BaseAnnotator):
Options are `INDEX`, `CLASS`, `TRACK`.
border_radius (int): The radius to apply round edges. If the selected
value is higher than the lower dimension, width or height, is clipped.
spread_out (bool): Spread out the labels to avoid overlapping.
smart_positions (bool): Spread out the labels to avoid overlapping.
"""
self.color = color
self.text_color = text_color
@ -1387,7 +1387,7 @@ class RichLabelAnnotator(BaseAnnotator):
self.text_anchor = text_position
self.color_lookup = color_lookup
self.border_radius = border_radius
self.spread_out = spread_out
self.smart_positions = smart_positions
self.font = self._load_font(font_size, font_path)
@ensure_pil_image_for_annotation
@ -1448,7 +1448,7 @@ class RichLabelAnnotator(BaseAnnotator):
detections, text_properties, self.text_anchor
)
if self.spread_out:
if self.smart_positions:
xyxy = spread_out_boxes(xyxy, step=2, max_iterations=len(xyxy) * 20)
self._draw_labels(

8
supervision/keypoint/annotators.py
View File

@ -202,7 +202,7 @@ class VertexLabelAnnotator:
text_thickness: int = 1,
text_padding: int = 10,
border_radius: int = 0,
spread_out: bool = False,
smart_positions: bool = False,
):
"""
Args:
@ -217,7 +217,7 @@ class VertexLabelAnnotator:
text_padding (int): The padding around the text.
border_radius (int): The radius of the rounded corners of the
boxes. Set to a high value to produce circles.
spread_out (bool): Spread out the labels to avoid overlap.
smart_positions (bool): Spread out the labels to avoid overlap.
"""
self.border_radius: int = border_radius
self.color: Union[Color, List[Color]] = color
@ -225,7 +225,7 @@ class VertexLabelAnnotator:
self.text_scale: float = text_scale
self.text_thickness: int = text_thickness
self.text_padding: int = text_padding
self.spread_out = spread_out
self.smart_positions = smart_positions
def annotate(
self,
@ -362,7 +362,7 @@ class VertexLabelAnnotator:
)
xyxy_padded = pad_boxes(xyxy=xyxy, px=self.text_padding)
if self.spread_out:
if self.smart_positions:
xyxy_padded = spread_out_boxes(
xyxy_padded, step=2, max_iterations=len(xyxy_padded) * 20
)