Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions t4_devkit/viewer/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
__all__ = ["RerunViewer", "format_entity"]


def format_entity(root: str, *entities: Sequence[str]) -> str:
def format_entity(*entities: Sequence[str]) -> str:
"""Format entity path.

Args:
root (str): Root entity path.
*entities: Entity path(s).

Returns:
Expand All @@ -48,15 +47,16 @@ def format_entity(root: str, *entities: Sequence[str]) -> str:
>>> format_entity("map", "map/base_link", "camera")
"map/base_link/camera"
"""
if len(entities) == 0:
return root

flattened = [s for t in entities for s in t.split("/")]

if osp.basename(root) == flattened[0]:
return osp.join(root, "/".join(flattened[1:])) if len(flattened) > 1 else root
else:
return osp.join(root, "/".join(entities))
if not entities:
return ""

flattened = []
for entity in entities:
for part in entity.split("/"):
if part and flattened and flattened[-1] == part:
continue
flattened.append(part)
return "/".join(flattened)


class RerunViewer:
Expand Down
1 change: 1 addition & 0 deletions tests/viewer/test_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def test_format_entity() -> None:
assert "map/base_link" == format_entity("map", "base_link")
assert "map/base_link" == format_entity("map", "map/base_link")
assert "map/base_link/camera" == format_entity("map", "map/base_link", "camera")
assert "map/base_link/camera" == format_entity("map", "map/base_link", "base_link/camera")


def test_render_box3ds(dummy_viewer, dummy_box3ds) -> None:
Expand Down
Loading