mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-22 08:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nav: ETA layout improvements (#21361)

Browse Source 
* bold and more space

* rounded corners

* oneline

* center

* fix am/pm

* revert width change
This commit is contained in:
Willem Melching
2021-06-21 17:23:44 +02:00
committed by GitHub
parent c60f5ab6f6
commit a3b155839b
2 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
selfdrive/ui/qt/maps/map.cc
View File

@@ -45,9 +45,9 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) : m_settings(settings) {
map_eta = new MapETA(this);
connect(this, &MapWindow::ETAChanged, map_eta, &MapETA::updateETA);
const int h = 180;
const int h = 120;
map_eta->setFixedHeight(h);
map_eta->move(0, 1080 - h);
map_eta->move(25, 1080 - h);
map_eta->setVisible(false);
// Routing
@@ -639,49 +639,46 @@ void MapInstructions::updateInstructions(QMap<QString, QVariant> banner, bool fu
MapETA::MapETA(QWidget * parent) : QWidget(parent) {
QHBoxLayout *main_layout = new QHBoxLayout(this);
main_layout->setContentsMargins(20, 25, 20, 25);
main_layout->setContentsMargins(40, 25, 40, 25);
{
QVBoxLayout *layout = new QVBoxLayout;
QHBoxLayout *layout = new QHBoxLayout;
eta = new QLabel;
eta->setAlignment(Qt::AlignCenter);
eta->setStyleSheet("font-weight:600");
auto eta_unit = new QLabel("eta");
eta_unit = new QLabel;
eta_unit->setAlignment(Qt::AlignCenter);
layout->addStretch();
layout->addWidget(eta);
layout->addWidget(eta_unit);
layout->addStretch();
main_layout->addLayout(layout);
}
main_layout->addSpacing(30);
main_layout->addSpacing(40);
{
QVBoxLayout *layout = new QVBoxLayout;
QHBoxLayout *layout = new QHBoxLayout;
time = new QLabel;
time->setAlignment(Qt::AlignCenter);
time_unit = new QLabel;
time_unit->setAlignment(Qt::AlignCenter);
layout->addStretch();
layout->addWidget(time);
layout->addWidget(time_unit);
layout->addStretch();
main_layout->addLayout(layout);
}
main_layout->addSpacing(30);
main_layout->addSpacing(40);
{
QVBoxLayout *layout = new QVBoxLayout;
QHBoxLayout *layout = new QHBoxLayout;
distance = new QLabel;
distance->setAlignment(Qt::AlignCenter);
distance->setStyleSheet("font-weight:600");
distance_unit = new QLabel;
distance_unit->setAlignment(Qt::AlignCenter);
layout->addStretch();
layout->addWidget(distance);
layout->addWidget(distance_unit);
layout->addStretch();
main_layout->addLayout(layout);
}
@@ -707,8 +704,11 @@ void MapETA::updateETA(float s, float s_typical, float d) {
auto eta_time = QDateTime::currentDateTime().addSecs(s).time();
if (params.getBool("NavSettingTime24h")) {
eta->setText(eta_time.toString("HH:mm"));
eta_unit->setText("eta");
} else {
eta->setText(eta_time.toString("h:mm a"));
auto t = eta_time.toString("h:mm a").split(' ');
eta->setText(t[0]);
eta_unit->setText(t[1]);
}
// Remaining time
@@ -721,17 +721,18 @@ void MapETA::updateETA(float s, float s_typical, float d) {
time_unit->setText("hr");
}
QString color;
if (s / s_typical > 1.5) {
time_unit->setStyleSheet(R"(color: #DA3025; )");
time->setStyleSheet(R"(color: #DA3025; )");
color = "#DA3025";
} else if (s / s_typical > 1.2) {
time_unit->setStyleSheet(R"(color: #DAA725; )");
time->setStyleSheet(R"(color: #DAA725; )");
color = "#DAA725";
} else {
time_unit->setStyleSheet(R"(color: #25DA6E; )");
time->setStyleSheet(R"(color: #25DA6E; )");
color = "#25DA6E";
}
time->setStyleSheet(QString(R"(color: %1; font-weight:600;)").arg(color));
time_unit->setStyleSheet(QString(R"(color: %1;)").arg(color));
// Distance
QString distance_str;
float num = 0;
@@ -747,4 +748,23 @@ void MapETA::updateETA(float s, float s_typical, float d) {
distance->setText(distance_str);
adjustSize();
// Rounded corners
const int radius = 25;
const auto r = rect();
// Top corners rounded
QPainterPath path;
path.setFillRule(Qt::WindingFill);
path.addRoundedRect(r, radius, radius);
// Bottom corners not rounded
path.addRect(r.marginsRemoved(QMargins(0, radius, 0, 0)));
// Set clipping mask
QRegion mask = QRegion(path.simplified().toFillPolygon().toPolygon());
setMask(mask);
// Center
move(static_cast<QWidget*>(parent())->width() / 2 - width() / 2, 1080 - height());
}

1
selfdrive/ui/qt/maps/map.h
View File

@@ -51,6 +51,7 @@ class MapETA : public QWidget {
private:
QLabel *eta;
QLabel *eta_unit;
QLabel *time;
QLabel *time_unit;
QLabel *distance;