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

ui: metric wider set speed box (#24890)

Browse Source
This commit is contained in:
Willem Melching
2022-06-21 11:14:25 +02:00
committed by GitHub
parent d261ff6d03
commit f7205f3b07
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/onroad.cc
+2 -1
View File
@@ -196,6 +196,7 @@ void NvgWindow::updateState(const UIState &s) {
setProperty("has_eu_speed_limit", nav_alive && speed_limit_sign == cereal::NavInstruction::SpeedLimitSign::VIENNA);
setProperty("is_cruise_set", cruise_set);
setProperty("is_metric", s.scene.is_metric);
setProperty("speed", cur_speed);
setProperty("setSpeed", set_speed);
setProperty("speedUnit", s.scene.is_metric ? "km/h" : "mph");
@@ -225,8 +226,8 @@ void NvgWindow::drawHud(QPainter &p) {
// Draw outer box + border to contain set speed and speed limit
int default_rect_width = 172;
int rect_width = default_rect_width;
if (is_metric || has_eu_speed_limit) rect_width = 200;
if (has_us_speed_limit && speedLimitStr.size() >= 3) rect_width = 223;
else if (has_eu_speed_limit) rect_width = 200;
int rect_height = 204;
if (has_us_speed_limit) rect_height = 402;
selfdrive/ui/qt/onroad.h
+2
View File
@@ -34,6 +34,7 @@ class NvgWindow : public CameraViewWidget {
Q_PROPERTY(bool is_cruise_set MEMBER is_cruise_set);
Q_PROPERTY(bool has_eu_speed_limit MEMBER has_eu_speed_limit);
Q_PROPERTY(bool has_us_speed_limit MEMBER has_us_speed_limit);
Q_PROPERTY(bool is_metric MEMBER is_metric);
Q_PROPERTY(bool engageable MEMBER engageable);
Q_PROPERTY(bool dmActive MEMBER dmActive);
@@ -57,6 +58,7 @@ private:
float setSpeed;
float speedLimit;
bool is_cruise_set = false;
bool is_metric = false;
bool engageable = false;
bool dmActive = false;
bool hideDM = false;