mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-09-30 19:33:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

onboarding: small cleanup (#21351)

Browse Source
This commit is contained in:
Dean Lee
2021-06-21 09:59:49 +08:00
committed by GitHub
parent 56d5db5766
commit 2433cb28bb
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/onboarding.cc
+5 -7
View File
@@ -11,7 +11,6 @@
void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
QPoint touch = QPoint(e->x(), e->y()) - imageCorner;
//qDebug() << touch.x() << ", " << touch.y();
// Check for restart
if (currentIndex == (boundingBox.size() - 1) && 200 <= touch.x() && touch.x() <= 920 &&
@@ -78,7 +77,7 @@ void TermsPage::showEvent(QShowEvent *event) {
QHBoxLayout* buttons = new QHBoxLayout;
main_layout->addLayout(buttons);
decline_btn = new QPushButton("Decline");
QPushButton *decline_btn = new QPushButton("Decline");
buttons->addWidget(decline_btn);
QObject::connect(decline_btn, &QPushButton::released, this, &TermsPage::declinedTerms);
@@ -93,7 +92,6 @@ void TermsPage::showEvent(QShowEvent *event) {
void TermsPage::enableAccept() {
accept_btn->setText("Accept");
accept_btn->setEnabled(true);
return;
}
void DeclinePage::showEvent(QShowEvent *event) {
@@ -113,13 +111,13 @@ void DeclinePage::showEvent(QShowEvent *event) {
QHBoxLayout* buttons = new QHBoxLayout;
main_layout->addLayout(buttons);
back_btn = new QPushButton("Back");
QPushButton *back_btn = new QPushButton("Back");
buttons->addWidget(back_btn);
buttons->addSpacing(50);
QObject::connect(back_btn, &QPushButton::released, this, &DeclinePage::getBack);
uninstall_btn = new QPushButton("Decline, uninstall openpilot");
QPushButton *uninstall_btn = new QPushButton("Decline, uninstall openpilot");
uninstall_btn->setStyleSheet("background-color: #E22C2C;");
buttons->addWidget(uninstall_btn);
@@ -131,8 +129,8 @@ void DeclinePage::showEvent(QShowEvent *event) {
}
void OnboardingWindow::updateActiveScreen() {
accepted_terms = params.get("HasAcceptedTerms") == current_terms_version;
training_done = params.get("CompletedTrainingVersion") == current_training_version;
bool accepted_terms = params.get("HasAcceptedTerms") == current_terms_version;
bool training_done = params.get("CompletedTrainingVersion") == current_training_version;
if (!accepted_terms) {
setCurrentIndex(0);
} else if (!training_done && !params.getBool("Passive")) {
selfdrive/ui/qt/offroad/onboarding.h
-5
View File
@@ -64,7 +64,6 @@ private:
void showEvent(QShowEvent *event) override;
QPushButton *accept_btn;
QPushButton *decline_btn;
signals:
void acceptedTerms();
@@ -79,8 +78,6 @@ public:
private:
void showEvent(QShowEvent *event) override;
QPushButton *back_btn;
QPushButton *uninstall_btn;
signals:
void getBack();
@@ -99,8 +96,6 @@ private:
Params params;
std::string current_terms_version;
std::string current_training_version;
bool accepted_terms = false;
bool training_done = false;
signals:
void onboardingDone();