From e90f6105e232e24a895cb2e66908e1056ad7cc5d Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 9 Mar 2024 02:25:47 -0800 Subject: [PATCH] some clean up --- selfdrive/ui/qt/offroad/settings.cc | 4 ---- selfdrive/ui/qt/window.cc | 8 -------- selfdrive/ui/qt/window.h | 6 ------ selfdrive/ui/ui.cc | 3 --- 4 files changed, 21 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 6a699a4698..75a6c11954 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -350,10 +350,6 @@ void SettingsWindow::setCurrentPanel(int index, const QString ¶m) { void SettingsWindow::updateState(const UIState &s) { qDebug() << "updateState" << static_cast(s.scene.personality); const SubMaster &sm = *(s.sm); -// if (s.scene.started && sm.updated("longitudinalPlan")) { -// -// emit updatePersonalitySetting(static_cast(s.scene.personality)); -// } if (sm.updated("longitudinalPlan")) { auto personality = sm["longitudinalPlan"].getLongitudinalPlan().getPersonality(); if (personality != s.scene.personality && s.scene.started) { diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index d3a6f40162..74fd05ed7b 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -4,17 +4,10 @@ #include "system/hardware/hw.h" -//void MainWindow::updateState(const UIState &s) { -//// qDebug() << "updateState" << static_cast(s.scene.personality); -//// emit updatePersonalitySetting(static_cast(s.scene.personality)); -//} - MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { main_layout = new QStackedLayout(this); main_layout->setMargin(0); -// QObject::connect(uiState(), &UIState::uiUpdate, this, &MainWindow::updateState); - homeWindow = new HomeWindow(this); main_layout->addWidget(homeWindow); QObject::connect(homeWindow, &HomeWindow::openSettings, this, &MainWindow::openSettings); @@ -22,7 +15,6 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { settingsWindow = new SettingsWindow(this); main_layout->addWidget(settingsWindow); -// QObject::connect(this, &MainWindow::updatePersonalitySetting, settingsWindow, &SettingsWindow::updatePersonalitySetting); QObject::connect(settingsWindow, &SettingsWindow::closeSettings, this, &MainWindow::closeSettings); QObject::connect(settingsWindow, &SettingsWindow::reviewTrainingGuide, [=]() { onboardingWindow->showTrainingGuide(); diff --git a/selfdrive/ui/qt/window.h b/selfdrive/ui/qt/window.h index 65990cadfe..05b61e1f76 100644 --- a/selfdrive/ui/qt/window.h +++ b/selfdrive/ui/qt/window.h @@ -13,12 +13,6 @@ class MainWindow : public QWidget { public: explicit MainWindow(QWidget *parent = 0); -//private slots: -// void updateState(const UIState &s); - -signals: - void updatePersonalitySetting(int personality); - private: bool eventFilter(QObject *obj, QEvent *event) override; void openSettings(int index = 0, const QString ¶m = ""); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index a37f82cf51..ddcc06ba20 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -207,9 +207,6 @@ static void update_state(UIState *s) { float scale = (cam_state.getSensor() == cereal::FrameData::ImageSensor::AR0231) ? 6.0f : 1.0f; scene.light_sensor = std::max(100.0f - scale * cam_state.getExposureValPercent(), 0.0f); } -// if (sm.updated("longitudinalPlan")) { -// scene.personality = sm["longitudinalPlan"].getLongitudinalPlan().getPersonality(); -// } scene.started = sm["deviceState"].getDeviceState().getStarted() && scene.ignition; scene.world_objects_visible = scene.world_objects_visible ||