mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-08-20 15:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

use dp logo

Browse Source
This commit is contained in:
Rick Lan
2024-06-13 22:05:47 +08:00
parent be7a2a284a
commit 53ca49631b
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/SConscript
+1 -1
View File
@@ -53,7 +53,7 @@ qt_src = ["main.cc", "qt/sidebar.cc", "qt/body.cc",
"qt/onroad/buttons.cc", "qt/onroad/alerts.cc"]
if dp_priv:
# qt_src = insert_src(qt_src, "qt/sidebar.cc", ["#dp_priv/selfdrive/ui/qt/sidebar.cc", "#dp_priv/selfdrive/ui/qt/onroad.cc"])
qt_src = insert_src(qt_src, "qt/sidebar.cc", ["#dp_priv/selfdrive/ui/qt/sidebar.cc"])
qt_src = insert_src(qt_src, "qt/offroad/settings.cc", ["#dp_priv/selfdrive/ui/qt/offroad/settings.cc", "#dp_priv/selfdrive/ui/qt/offroad/settings_dp.cc"])
qt_src = insert_src(qt_src, "qt/onroad/onroad_home.cc", ["#dp_priv/selfdrive/ui/qt/onroad/onroad_home.cc"])
qt_src = insert_src(qt_src, "qt/onroad/annotated_camera.cc", ["#dp_priv/selfdrive/ui/qt/onroad/annotated_camera.cc"])
selfdrive/ui/qt/sidebar.cc
+6 -1
View File
@@ -31,8 +31,13 @@ void Sidebar::drawMetric(QPainter &p, const QPair<QString, QString> &label, QCol
}
Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(false), settings_pressed(false) {
home_img = loadPixmap("../assets/images/button_home.png", home_btn.size());
#ifdef DP
home_img = get_dp_image(home_btn.size());
flag_img = get_dp_image(home_btn.size());
#else
home_img = loadPixmap("../../dp_ext/selfdrive/assets/images/button_home.png", home_btn.size());
flag_img = loadPixmap("../assets/images/button_flag.png", home_btn.size());
#endif
settings_img = loadPixmap("../assets/images/button_settings.png", settings_btn.size(), Qt::IgnoreAspectRatio);
connect(this, &Sidebar::valueChanged, [=] { update(); });
selfdrive/ui/qt/spinner.cc
+10 -2
View File
@@ -14,14 +14,22 @@
#include "system/hardware/hw.h"
#include "selfdrive/ui/qt/qt_window.h"
#include "selfdrive/ui/qt/util.h"
#ifdef DP
#include "dp_priv/selfdrive/ui/qt/util.h"
#endif
TrackWidget::TrackWidget(QWidget *parent) : QWidget(parent) {
setAttribute(Qt::WA_OpaquePaintEvent);
setFixedSize(spinner_size);
// pre-compute all the track imgs. make this a gif instead?
QPixmap comma_img = loadPixmap("../assets/img_spinner_comma.png", spinner_size);
QPixmap track_img = loadPixmap("../assets/img_spinner_track.png", spinner_size);
#ifdef DP
QPixmap comma_img = get_dp_image(spinner_size);
QPixmap track_img = get_dp_track_image(spinner_size);
#else
QPixmap comma_img = loadPixmap("../../dp_ext/selfdrive/assets/img_spinner_comma.png", spinner_size);
QPixmap track_img = loadPixmap("../../dp_ext/selfdrive/assets/img_spinner_track.png", spinner_size);
#endif
QTransform transform(1, 0, 0, 1, width() / 2, height() / 2);
QPixmap pm(spinner_size);