brianhansonxyz/oscarpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-02-17 13:39:07 -06:00
parent f50ad15347
commit f78628f919
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
selfdrive/ui/qt/window.cc
View File

@@ -13,14 +13,14 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
QObject::connect(homeWindow, &HomeWindow::openSettings, this, &MainWindow::openSettings); QObject::connect(homeWindow, &HomeWindow::openSettings, this, &MainWindow::openSettings);
QObject::connect(homeWindow, &HomeWindow::closeSettings, this, &MainWindow::closeSettings); QObject::connect(homeWindow, &HomeWindow::closeSettings, this, &MainWindow::closeSettings);
OscarSettingsWindow = new OscarSettingsWindow(this); oscarSettingsWindow = new OscarSettingsWindow(this);
main_layout->addWidget(OscarSettingsWindow); main_layout->addWidget(oscarSettingsWindow);
QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::closeSettings, this, &MainWindow::closeSettings); QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::closeSettings, this, &MainWindow::closeSettings);
QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::reviewTrainingGuide, [=]() { QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::reviewTrainingGuide, [=]() {
onboardingWindow->showTrainingGuide(); onboardingWindow->showTrainingGuide();
main_layout->setCurrentWidget(onboardingWindow); main_layout->setCurrentWidget(onboardingWindow);
}); });
QObject::connect(OscarSettingsWindow, &OscarSettingsWindow::showDriverView, [=] { QObject::connect(oscarSettingsWindow, &OscarSettingsWindow::showDriverView, [=] {
homeWindow->showDriverView(true); homeWindow->showDriverView(true);
}); });
@@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
} }
}); });
// QObject::connect(device(), &Device::interactiveTimeout, [=]() { // QObject::connect(device(), &Device::interactiveTimeout, [=]() {
// if (main_layout->currentWidget() == OscarSettingsWindow) { // if (main_layout->currentWidget() == oscarSettingsWindow) {
// closeSettings(); // closeSettings();
// } // }
// }); // });
@@ -66,8 +66,8 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
} }
void MainWindow::openSettings(int index, const QString &param) { void MainWindow::openSettings(int index, const QString &param) {
main_layout->setCurrentWidget(OscarSettingsWindow); main_layout->setCurrentWidget(oscarSettingsWindow);
OscarSettingsWindow->setCurrentPanel(index, param); oscarSettingsWindow->setCurrentPanel(index, param);
} }
void MainWindow::closeSettings() { void MainWindow::closeSettings() {
@@ -93,7 +93,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
case QEvent::MouseMove: { case QEvent::MouseMove: {
// ignore events when device is awakened by resetInteractiveTimeout // ignore events when device is awakened by resetInteractiveTimeout
ignore = !device()->isAwake(); ignore = !device()->isAwake();
// if (main_layout->currentWidget() == OscarSettingsWindow) { // if (main_layout->currentWidget() == oscarSettingsWindow) {
// Not working... // Not working...
// device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window // device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window
// } else { // } else {