This commit is contained in:
Your Name
2024-05-09 21:17:20 -05:00
parent ffe401f5d1
commit fbd09ad9bd
3 changed files with 54 additions and 94 deletions

View File

@@ -44,7 +44,6 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
slayout->addWidget(body);
// CLEARPILOT
// show_ready = true;
ready = new ReadyWindow(this);
slayout->addWidget(ready);
@@ -89,6 +88,7 @@ void HomeWindow::offroadTransition(bool offroad) {
if (offroad) {
sidebar->setVisible(false);
slayout->setCurrentWidget(ready);
refresh();
// this->showDriverView(true, true); // Temp
} else {
sidebar->setVisible(false);
@@ -190,42 +190,7 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) {
home_layout->setContentsMargins(0, 0, 0, 0);
home_layout->setSpacing(30);
// left: MapSettings/PrimeAdWidget
// QStackedWidget *left_widget = new QStackedWidget(this);
#ifdef ENABLE_MAPS
// left_widget->addWidget(new MapSettings);
#else
// left_widget->addWidget(new QWidget);
#endif
// left_widget->addWidget(new PrimeAdWidget);
// left_widget->addWidget(new DriveStats);
// left_widget->setStyleSheet("border-radius: 10px;");
// left_widget->setCurrentIndex(2);
// connect(uiState(), &UIState::primeChanged, [=](bool prime) {
// left_widget->setCurrentIndex(2);
// });
// 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);
// CLEARPILOT TEMP
// QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings);
// 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);
// Clearpilot: removed home ui widgets
}
center_layout->addWidget(home_widget);
@@ -262,12 +227,10 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) {
)");
}
/* Refresh data on screen every 5 seconds. */
void OffroadHome::showEvent(QShowEvent *event) {
refresh();
// CLEARPILOT changed timeout to 2 min
// What does this even do?
timer->start(120 * 1000);
// slayout->addWidget(ready);
timer->start(5 * 1000);
}
void OffroadHome::hideEvent(QHideEvent *event) {
@@ -303,4 +266,8 @@ void OffroadHome::refresh() {
if (alerts) {
alert_notif->setText(QString::number(alerts) + (alerts > 1 ? tr(" ALERTS") : tr(" ALERT")));
}
if (ready->isVisible()) {
ready->refresh();
}
}