From 3533d59547cb2f351410cfeda24aae03ac57fa86 Mon Sep 17 00:00:00 2001 From: FrogAi <91348155+FrogAi@users.noreply.github.com> Date: Sat, 11 May 2024 15:04:37 -0700 Subject: [PATCH] Visuals - Quality of Life - Full Map --- selfdrive/ui/qt/offroad/settings.cc | 2 ++ selfdrive/ui/qt/onroad.cc | 2 +- selfdrive/ui/ui.cc | 1 + selfdrive/ui/ui.h | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 745a07e..37f136a 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -161,6 +161,8 @@ void TogglesPanel::updateToggles() { disengage_on_accelerator_toggle->setVisible(!params.getBool("AlwaysOnLateral")); auto driver_camera_toggle = toggles["RecordFront"]; driver_camera_toggle->setVisible(!(params.getBool("DeviceManagement") && params.getBool("NoLogging") && params.getBool("NoUploads"))); + auto nav_settings_left_toggle = toggles["NavSettingLeftSide"]; + nav_settings_left_toggle->setVisible(!params.getBool("FullMap")); auto experimental_mode_toggle = toggles["ExperimentalMode"]; auto op_long_toggle = toggles["ExperimentalLongitudinalEnabled"]; diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index bfb3ddf..c30fa65 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -100,7 +100,7 @@ void OnroadWindow::updateState(const UIState &s) { Alert alert = Alert::get(*(s.sm), s.scene.started_frame); alerts->updateAlert(alert); - if (s.scene.map_on_left) { + if (s.scene.map_on_left || scene.full_map) { split->setDirection(QBoxLayout::LeftToRight); } else { split->setDirection(QBoxLayout::RightToLeft); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 1339bb8..086110c 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -399,6 +399,7 @@ void ui_update_frogpilot_params(UIState *s) { bool quality_of_life_visuals = params.getBool("QOLVisuals"); scene.big_map = quality_of_life_visuals && params.getBool("BigMap"); + scene.full_map = scene.big_map && params.getBool("FullMap"); scene.speed_limit_controller = scene.longitudinal_control && params.getBool("SpeedLimitController"); scene.show_slc_offset = scene.speed_limit_controller && params.getBool("ShowSLCOffset"); diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 74680ca..14df175 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -206,6 +206,7 @@ typedef struct UIScene { bool experimental_mode_via_screen; bool fahrenheit; bool fps_counter; + bool full_map; bool has_auto_tune; bool hide_lead_marker; bool holiday_themes;