diff --git a/selfdrive/clearpilot/resource/DALL·E 2024-05-17 09.54.42 - Logo for a self-driving software called ClearPilot. The logo features a glass steering wheel where the transparent glass has a backdrop of a scene of .webp b/selfdrive/clearpilot/resource/DALL·E 2024-05-17 09.54.42 - Logo for a self-driving software called ClearPilot. The logo features a glass steering wheel where the transparent glass has a backdrop of a scene of .webp new file mode 100644 index 0000000..5122a8e Binary files /dev/null and b/selfdrive/clearpilot/resource/DALL·E 2024-05-17 09.54.42 - Logo for a self-driving software called ClearPilot. The logo features a glass steering wheel where the transparent glass has a backdrop of a scene of .webp differ diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index a2f5704..823281d 100755 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -30,7 +30,7 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) { sidebar = new Sidebar(this); main_layout->addWidget(sidebar); QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings); - QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::openOnroad); + QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::showOnroad); slayout = new QStackedLayout(); main_layout->addLayout(slayout); @@ -61,8 +61,10 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) { } // Debug function to activate onroad UI -void HomeWindow::openOnroad() { +void HomeWindow::showOnroad() { sidebar->setVisible(false); + slayout->setCurrentWidget(onroad); + // sidebar->setVisible(params.getBool("Sidebar")); } void HomeWindow::showSidebar(bool show) { @@ -125,7 +127,7 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) { void HomeWindow::mouseDoubleClickEvent(QMouseEvent* e) { HomeWindow::mousePressEvent(e); - const SubMaster &sm = *(uiState()->sm); + // const SubMaster &sm = *(uiState()->sm); } // OffroadHome: the offroad home page diff --git a/selfdrive/ui/qt/home.h b/selfdrive/ui/qt/home.h index 75b69ce..26949a9 100755 --- a/selfdrive/ui/qt/home.h +++ b/selfdrive/ui/qt/home.h @@ -58,6 +58,7 @@ signals: public slots: void offroadTransition(bool offroad); void showDriverView(bool show, bool started=false); + void showOnroad(); void showSidebar(bool show); void showMapPanel(bool show); diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index f91fb6a..57cf40f 100755 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -127,7 +127,9 @@ void Sidebar::mouseReleaseEvent(QMouseEvent *event) { emit openOnroad(); } else if (settings_btn.contains(event->pos())) { + emit openSettings(); + } }