some clean up

pull/31792/head
Shane Smiskol 1 year ago
parent 30c8e5cd02
commit e90f6105e2
  1. 4
      selfdrive/ui/qt/offroad/settings.cc
  2. 8
      selfdrive/ui/qt/window.cc
  3. 6
      selfdrive/ui/qt/window.h
  4. 3
      selfdrive/ui/ui.cc

@ -350,10 +350,6 @@ void SettingsWindow::setCurrentPanel(int index, const QString &param) {
void SettingsWindow::updateState(const UIState &s) {
qDebug() << "updateState" << static_cast<int>(s.scene.personality);
const SubMaster &sm = *(s.sm);
// if (s.scene.started && sm.updated("longitudinalPlan")) {
//
// emit updatePersonalitySetting(static_cast<int>(s.scene.personality));
// }
if (sm.updated("longitudinalPlan")) {
auto personality = sm["longitudinalPlan"].getLongitudinalPlan().getPersonality();
if (personality != s.scene.personality && s.scene.started) {

@ -4,17 +4,10 @@
#include "system/hardware/hw.h"
//void MainWindow::updateState(const UIState &s) {
//// qDebug() << "updateState" << static_cast<int>(s.scene.personality);
//// emit updatePersonalitySetting(static_cast<int>(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();

@ -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 &param = "");

@ -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 ||

Loading…
Cancel
Save