mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-07-23 20:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor setup command sequence by removing redundant kill operation.

Browse Source 
The `kill_op` command to stop the `comma` service was removed as it is redundant. This change simplifies the `cmd` string construction and ensures the setup process starts with deleting `continue.sh` and restarting the `comma` service.

don't know what diff it makes MinimumExpanding vs Expanding so I am leaving it as I found it and some formatting on the code

Improved user interface of application

The user interface in selfdrive/ui/qt/text.cc was significantly enhanced. This was accomplished by streamlining the QVBoxLayout for displaying text and the QGridLayout for displaying buttons. The QPushButton were updated to handle actions for updating and reinstalling. Additional formatting was also added to improve the visibility of the buttons. Furthermore, unnecessary QWidget import was removed and replaced with QLabel. The QLabel was set to clear before setting newText, creating a smoother update of application status messages. Lastly, QApplication::exec() was used in place of a.exec() to cater for the button states on different platforms and handle the application's exit.
This commit is contained in:
DevTekVE
2024-07-05 10:50:32 +02:00
parent 11f0da4aa9
commit 303d244966
1 changed files with 86 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/text.cc
+86 -40
View File
@@ -1,9 +1,7 @@
#include <QApplication>
#include <QLabel>
#include <QPushButton>
#include <QScrollBar>
#include <QVBoxLayout>
#include <QWidget>
#include <QtConcurrent>
#include <cstdio>
#include <sstream>
@@ -29,50 +27,51 @@ std::string executeCommand(const char* cmd) {
return result.str();
}
// The format is intentional!
QLabel *label;
// The format is intentional, even if on PC doesn't look aligned. Font differences are likely the cause. On device it looks fine.
QString text = QString("%1\n%2\n%3\n%4\n%5\n%6\n%7")
.arg(" ________________________________________")
.arg("| |")
.arg("| " + QObject::tr("Update downloaded. Ready to reboot.") + " |")
.arg("| |")
.arg("| " + QObject::tr("Update: Check and Download Update") + " |")
.arg("| " + QObject::tr("Reboot: Reboot Device") + " |")
.arg("|________________________________________|");
.arg(" ________________________________________________________")
.arg("|\t\t\t\t\t\t|")
.arg("|\t" + QObject::tr("Update downloaded. Ready to reboot.") + "\t|")
.arg("|\t\t\t\t\t\t|")
.arg("|\t" + QObject::tr("Update: Check and Download Update") + "\t\t|")
.arg("|\t" + QObject::tr("Reboot: Reboot Device") + "\t\t\t|")
.arg("| _______________________________________________________\t|");
int main(int argc, char *argv[]) {
initApp(argc, argv);
QApplication a(argc, argv);
QWidget window;
setMainWindow(&window);
QGridLayout *main_layout = new QGridLayout(&window);
main_layout->setMargin(50);
QLabel *label = new QLabel(argv[1]);
void setupErrorMessageLabel(QVBoxLayout *main_layout) {
label->setWordWrap(true);
label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
ScrollView *scroll = new ScrollView(label);
auto *scroll = new ScrollView(label);
scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
main_layout->addWidget(scroll, 0, 0, Qt::AlignTop);
main_layout->addWidget(scroll);
// Scroll to the bottom
QObject::connect(scroll->verticalScrollBar(), &QAbstractSlider::rangeChanged, [=]() {
scroll->verticalScrollBar()->setValue(scroll->verticalScrollBar()->maximum());
});
}
QPushButton *btn = new QPushButton();
QPushButton *update_btn = new QPushButton();
void setupActionButton(QGridLayout *button_grid) {
auto *left_buttons = new QHBoxLayout();
auto *right_buttons = new QHBoxLayout();
auto *btn = new QPushButton();
auto *update_btn = new QPushButton();
update_btn->setText(QObject::tr("Update"));
auto *reinstall_btn = new QPushButton();
reinstall_btn->setText(QObject::tr("Launch Setup"));
#ifdef __aarch64__
btn->setText(QObject::tr("Reboot"));
QFutureWatcher<void> watcher;
auto *watcher = new QFutureWatcher<void>();
QObject::connect(btn, &QPushButton::clicked, [=]() {
Hardware::reboot();
});
QObject::connect(update_btn, &QPushButton::clicked, [=, &watcher]() {
QObject::connect(update_btn, &QPushButton::clicked, [=]() {
btn->setEnabled(false);
update_btn->setEnabled(false);
reinstall_btn->setEnabled(false);
update_btn->setText(QObject::tr("Updating..."));
const std::string git_branch = Params().get("GitBranch");
const std::string git_remote = Params().get("GitRemote");
@@ -90,26 +89,70 @@ int main(int argc, char *argv[]) {
const std::string cmd = to_home_dir + "; " + remote_cmd + "; " + fetch_remote + "; " + reset_branch;
QFuture<void> future = QtConcurrent::run([=]() {
label->clear();
std::string output = executeCommand(cmd.c_str());
//LOGW("CHECK OUTPUT PLS\n%s", output.c_str());
QMetaObject::invokeMethod(label, "setText", Qt::QueuedConnection,
Q_ARG(QString, QString::fromStdString(output) + text));
auto formatted = QString::fromStdString(output) + text;
QMetaObject::invokeMethod(label, "clear", Qt::QueuedConnection);
QMetaObject::invokeMethod(label, "setText", Qt::QueuedConnection, Q_ARG(QString, formatted));
});
QObject::connect(&watcher, &QFutureWatcher<void>::finished, [=]() {
btn->setEnabled(true);
update_btn->setEnabled(true);
update_btn->setText(QObject::tr("Update"));
});
watcher.setFuture(future);
watcher->setFuture(future);
});
QObject::connect(watcher, &QFutureWatcher<void>::finished, [=]() {
btn->setEnabled(true);
update_btn->setEnabled(true);
reinstall_btn->setEnabled(true);
update_btn->setText(QObject::tr("Update"));
});
QObject::connect(reinstall_btn, &QPushButton::clicked, [=]() {
btn->setEnabled(false);
update_btn->setEnabled(false);
reinstall_btn->setEnabled(false);
reinstall_btn->setText(QObject::tr("Starting setup..."));
const std::string delete_continue = "sudo rm /data/continue.sh";
const std::string restart_op = "sudo systemctl restart comma";
const std::string cmd = delete_continue + "; " + restart_op + "; ";
// Start setup command asynchronously
QtConcurrent::run([=]() {
executeCommand(cmd.c_str());
});
QApplication::quit();
});
#else
update_btn->setEnabled(false);
btn->setText(QObject::tr("Exit"));
QObject::connect(btn, &QPushButton::clicked, &a, &QApplication::quit);
QObject::connect(btn, &QPushButton::clicked, &app, &QApplication::quit);
#endif
main_layout->addWidget(btn, 0, 0, Qt::AlignRight | Qt::AlignBottom);
main_layout->addWidget(update_btn, 0, 0, Qt::AlignLeft | Qt::AlignBottom);
left_buttons->addWidget(update_btn);
left_buttons->addWidget(reinstall_btn);
right_buttons->addWidget(btn);
button_grid->addLayout(left_buttons, 0, 0, Qt::AlignLeft | Qt::AlignBottom);
button_grid->addLayout(right_buttons, 0, 1, Qt::AlignRight | Qt::AlignBottom);
}
int main(int argc, char *argv[]) {
initApp(argc, argv);
QApplication app(argc, argv);
QWidget window;
setMainWindow(&window);
auto *main_layout = new QVBoxLayout(&window);
main_layout->setMargin(50);
// Setup the text area layout
auto *text_layout = new QVBoxLayout();
label = new QLabel(argv[1]);
setupErrorMessageLabel(text_layout);
main_layout->addLayout(text_layout);
// Setup the button area layout
auto *button_layout = new QGridLayout();
setupActionButton(button_layout);
main_layout->addLayout(button_layout);
window.setStyleSheet(R"(
* {
@@ -126,11 +169,14 @@ int main(int argc, char *argv[]) {
border-radius: 20px;
margin-right: 40px;
}
QPushButton:pressed {
background-color: #4a4a4a;
}
QPushButton:disabled {
color: #33FFFFFF;
border: 2px solid #33FFFFFF;
}
)");
return a.exec();
return QApplication::exec();
}