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

ui/map: fix wrong remaining time (#28960)

Browse Source
This commit is contained in:
Dean Lee
2023-07-15 20:28:21 +08:00
committed by GitHub
parent 187696977e
commit 53934c7fee
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/maps/map.cc
+2 -3
View File
@@ -548,9 +548,8 @@ void MapETA::updateETA(float s, float s_typical, float d) {
: std::array{eta_t.toString("h:mm a").split(' ')[0], eta_t.toString("a")};
// Remaining time
auto time_t = QDateTime::fromTime_t(s);
auto remaining = s < 3600 ? std::array{time_t.toString("m"), tr("min")}
: std::array{time_t.toString("h:mm"), tr("hr")};
auto remaining = s < 3600 ? std::array{QString::number(int(s / 60)), tr("min")}
: std::array{QString("%1:%2").arg((int)s / 3600).arg(((int)s % 3600) / 60, 2, 10, QLatin1Char('0')), tr("hr")};
QString color = "#25DA6E";
if (s / s_typical > 1.5) color = "#DA3025";
else if (s / s_typical > 1.2) color = "#DAA725";