This commit is contained in:
royjr
2026-07-14 15:19:18 -04:00
parent 7e61a09717
commit 8bf9fb9893
3 changed files with 6 additions and 6 deletions
@@ -241,7 +241,7 @@ class AugmentedRoadView(CameraView):
if ui_state.radar_tracks:
radar_horizontal_padding = 8
radar_column_gap = 2
radar_column_gap = 8
radar_max_inner_width = int(self._content_rect.width - 40)
radar_range_max_width = radar_max_inner_width - 36 - radar_column_gap
self._radar_ranges_label.get_content_height(radar_range_max_width)
@@ -36,7 +36,7 @@ def format_radar_tracks_onroad_columns(live_tracks) -> tuple[str, str]:
if not sources:
return "", "none"
range_text = "\n".join(f"0x{source.startAddress:X}-0x{source.endAddress:X}" for source in sources)
range_text = "\n".join(f"{source.startAddress:X}-{source.endAddress:X}" for source in sources)
count_text = "\n".join(str(source.trackCount) for source in sources)
return range_text, count_text
@@ -19,8 +19,8 @@ def test_format_radar_tracks_status_range_and_count():
live_tracks.init("points", 2)
assert format_radar_tracks_status(live_tracks) == "0x500-0x51F · 2 tracks"
assert format_radar_tracks_onroad_status(live_tracks) == "0x500-0x51F 2"
assert format_radar_tracks_onroad_columns(live_tracks) == ("0x500-0x51F", "2")
assert format_radar_tracks_onroad_status(live_tracks) == "500-51F 2"
assert format_radar_tracks_onroad_columns(live_tracks) == ("500-51F", "2")
def test_format_radar_tracks_status_deduplicates_and_sorts_ranges():
@@ -33,9 +33,9 @@ def test_format_radar_tracks_status_deduplicates_and_sorts_ranges():
live_tracks.init("points", 1)
assert format_radar_tracks_status(live_tracks) == "0x210-0x21F, 0x500-0x51F · 1 track"
assert format_radar_tracks_onroad_status(live_tracks) == "0x210-0x21F 1\n0x500-0x51F 2\n0x500-0x51F 3"
assert format_radar_tracks_onroad_status(live_tracks) == "210-21F 1\n500-51F 2\n500-51F 3"
assert format_radar_tracks_onroad_columns(live_tracks) == (
"0x210-0x21F\n0x500-0x51F\n0x500-0x51F",
"210-21F\n500-51F\n500-51F",
"1\n2\n3",
)