From eb0ced8040bfbd18c26724b0efad46b6c3d883d4 Mon Sep 17 00:00:00 2001 From: Jaosn Wen Date: Wed, 17 Jul 2024 23:07:32 -0400 Subject: [PATCH] ui: header imports --- selfdrive/ui/qt/offroad/settings.h | 3 +- selfdrive/ui/qt/request_repeater.h | 4 + selfdrive/ui/qt/widgets/cameraview.h | 4 + selfdrive/ui/sunnypilot/qt/sp_priv_home.cc | 111 --------------------- 4 files changed, 10 insertions(+), 112 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.h b/selfdrive/ui/qt/offroad/settings.h index 734f47e01e..96fc04bbca 100644 --- a/selfdrive/ui/qt/offroad/settings.h +++ b/selfdrive/ui/qt/offroad/settings.h @@ -11,15 +11,16 @@ #include #include -#include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/util.h" #ifdef SUNNYPILOT +#include "selfdrive/ui/sunnypilot/sp_priv_ui.h" #include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h" #define ListWidget ListWidgetSP #define ParamControl ParamControlSP #define ButtonParamControl ButtonParamControlSP #else +#include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/widgets/controls.h" #endif diff --git a/selfdrive/ui/qt/request_repeater.h b/selfdrive/ui/qt/request_repeater.h index 45cb643b13..43ce6492c9 100644 --- a/selfdrive/ui/qt/request_repeater.h +++ b/selfdrive/ui/qt/request_repeater.h @@ -3,7 +3,11 @@ #include "common/swaglog.h" #include "common/util.h" #include "selfdrive/ui/qt/api.h" +#ifdef SUNNYPILOT +#include "selfdrive/ui/sunnypilot/sp_priv_ui.h" +#else #include "selfdrive/ui/ui.h" +#endif class RequestRepeater : public HttpRequest { diff --git a/selfdrive/ui/qt/widgets/cameraview.h b/selfdrive/ui/qt/widgets/cameraview.h index 526c17e77c..09a1479bf6 100644 --- a/selfdrive/ui/qt/widgets/cameraview.h +++ b/selfdrive/ui/qt/widgets/cameraview.h @@ -24,7 +24,11 @@ #include "msgq/visionipc/visionipc_client.h" #include "system/camerad/cameras/camera_common.h" +#ifdef SUNNYPILOT +#include "selfdrive/ui/sunnypilot/sp_priv_ui.h" +#else #include "selfdrive/ui/ui.h" +#endif const int FRAME_BUFFER_SIZE = 5; static_assert(FRAME_BUFFER_SIZE <= YUV_BUFFER_COUNT); diff --git a/selfdrive/ui/sunnypilot/qt/sp_priv_home.cc b/selfdrive/ui/sunnypilot/qt/sp_priv_home.cc index c8caade101..77a779484d 100644 --- a/selfdrive/ui/sunnypilot/qt/sp_priv_home.cc +++ b/selfdrive/ui/sunnypilot/qt/sp_priv_home.cc @@ -50,114 +50,3 @@ void HomeWindowSP::mousePressEvent(QMouseEvent* e) { } } } - -// OffroadHome: the offroad home page -// -// OffroadHomeSP::OffroadHomePS(QWidget* parent) : QFrame(parent) { -// QVBoxLayout* main_layout = new QVBoxLayout(this); -// main_layout->setContentsMargins(40, 40, 40, 40); -// -// // top header -// QHBoxLayout* header_layout = new QHBoxLayout(); -// header_layout->setContentsMargins(0, 0, 0, 0); -// header_layout->setSpacing(16); -// -// update_notif = new QPushButton(tr("UPDATE")); -// update_notif->setVisible(false); -// update_notif->setStyleSheet("background-color: #364DEF;"); -// QObject::connect(update_notif, &QPushButton::clicked, [=]() { center_layout->setCurrentIndex(1); }); -// header_layout->addWidget(update_notif, 0, Qt::AlignHCenter | Qt::AlignLeft); -// -// alert_notif = new QPushButton(); -// alert_notif->setVisible(false); -// alert_notif->setStyleSheet("background-color: #E22C2C;"); -// QObject::connect(alert_notif, &QPushButton::clicked, [=] { center_layout->setCurrentIndex(2); }); -// header_layout->addWidget(alert_notif, 0, Qt::AlignHCenter | Qt::AlignLeft); -// -// version = new ElidedLabel(); -// header_layout->addWidget(version, 0, Qt::AlignHCenter | Qt::AlignRight); -// -// main_layout->addLayout(header_layout); -// -// // main content -// main_layout->addSpacing(25); -// center_layout = new QStackedLayout(); -// -// QWidget *home_widget = new QWidget(this); -// { -// QHBoxLayout *home_layout = new QHBoxLayout(home_widget); -// home_layout->setContentsMargins(0, 0, 0, 0); -// home_layout->setSpacing(30); -// -// // left: PrimeAdWidget -// QStackedWidget *left_widget = new QStackedWidget(this); -// QVBoxLayout *left_prime_layout = new QVBoxLayout(); -// QWidget *prime_user = new PrimeUserWidget(); -// prime_user->setStyleSheet(R"( -// border-radius: 10px; -// background-color: #333333; -// )"); -// left_prime_layout->addWidget(prime_user); -// left_prime_layout->addStretch(); -// left_widget->addWidget(new LayoutWidget(left_prime_layout)); -// left_widget->addWidget(new PrimeAdWidget); -// left_widget->setStyleSheet("border-radius: 10px;"); -// -// left_widget->setCurrentIndex(uiState()->hasPrime() ? 0 : 1); -// connect(uiState(), &UIState::primeChanged, [=](bool prime) { -// left_widget->setCurrentIndex(prime ? 0 : 1); -// }); -// -// home_layout->addWidget(left_widget, 1); -// -// // right: ExperimentalModeButton, SetupWidget -// QWidget* right_widget = new QWidget(this); -// QVBoxLayout* right_column = new QVBoxLayout(right_widget); -// right_column->setContentsMargins(0, 0, 0, 0); -// right_widget->setFixedWidth(750); -// right_column->setSpacing(30); -// -// ExperimentalModeButton *experimental_mode = new ExperimentalModeButton(this); -// QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings); -// right_column->addWidget(experimental_mode, 1); -// -// SetupWidget *setup_widget = new SetupWidget; -// QObject::connect(setup_widget, &SetupWidget::openSettings, this, &OffroadHome::openSettings); -// right_column->addWidget(setup_widget, 1); -// -// home_layout->addWidget(right_widget, 1); -// } -// center_layout->addWidget(home_widget); -// -// // add update & alerts widgets -// update_widget = new UpdateAlert(); -// QObject::connect(update_widget, &UpdateAlert::dismiss, [=]() { center_layout->setCurrentIndex(0); }); -// center_layout->addWidget(update_widget); -// alerts_widget = new OffroadAlert(); -// QObject::connect(alerts_widget, &OffroadAlert::dismiss, [=]() { center_layout->setCurrentIndex(0); }); -// center_layout->addWidget(alerts_widget); -// -// main_layout->addLayout(center_layout, 1); -// -// // set up refresh timer -// timer = new QTimer(this); -// timer->callOnTimeout(this, &OffroadHome::refresh); -// -// setStyleSheet(R"( -// * { -// color: white; -// } -// OffroadHome { -// background-color: black; -// } -// OffroadHome > QPushButton { -// padding: 15px 30px; -// border-radius: 5px; -// font-size: 40px; -// font-weight: 500; -// } -// OffroadHome > QLabel { -// font-size: 55px; -// } -// )"); -// } \ No newline at end of file