diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 8c2f7cfca..7e1bb72f9 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -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"]) diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index d98ba612a..8cea2b10f 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -31,8 +31,13 @@ void Sidebar::drawMetric(QPainter &p, const QPair &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(); }); diff --git a/selfdrive/ui/qt/spinner.cc b/selfdrive/ui/qt/spinner.cc index 2404efa66..ee382d14a 100644 --- a/selfdrive/ui/qt/spinner.cc +++ b/selfdrive/ui/qt/spinner.cc @@ -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);