From de81acb040d6c911cd367190236b03a797d87bd1 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 20 Dec 2023 01:01:46 -0500 Subject: [PATCH] ui: sunnypilot: slight refactor --- .../qt/offroad/sunnypilot/sunnypilot_settings.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc b/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc index 3143cfe524..d467a500f1 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc +++ b/selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc @@ -257,18 +257,22 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) { list->addItem(horizontal_line()); } + } - // trigger updateToggles() when toggleFlipped - if (std::find(updateTogglesNames.begin(), updateTogglesNames.end(), param.toStdString()) != updateTogglesNames.end()) { - connect(toggle, &ToggleControl:: toggleFlipped, [=](bool state) { + // trigger updateToggles() when toggleFlipped + for (const auto& updateToggleName : updateTogglesNames) { + if (toggles.find(updateToggleName) != toggles.end()) { + connect(toggles[updateToggleName], &ToggleControl::toggleFlipped, [=](bool state) { updateToggles(); }); } + } - // trigger offroadTransition when going onroad/offroad - if (std::find(toggleOffroad.begin(), toggleOffroad.end(), param.toStdString()) != toggleOffroad.end()) { + // trigger offroadTransition when going onroad/offroad + for (const auto& offroadName : toggleOffroad) { + if (toggles.find(offroadName) != toggles.end()) { connect(uiState(), &UIState::offroadTransition, [=](bool offroad) { - toggle->setEnabled(offroad); + toggles[offroadName]->setEnabled(offroad); }); } }