From 301b09570ba31731fa99f0917ec1f36261d42ca5 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 20 Jul 2023 14:39:27 -0700 Subject: [PATCH] clean up --- selfdrive/ui/qt/onroad.cc | 9 ++------- selfdrive/ui/qt/onroad.h | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index a51fb98a33..19b715add6 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -226,12 +226,7 @@ MapSettingsButton::MapSettingsButton(QWidget *parent) : experimental_mode(false) setFixedSize(btn_size, btn_size); params = Params(); -// engage_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size}); -// engage_img = loadPixmap("../assets/navigation/nav-settings-square-padding.png", {img_size, img_size}); -// engage_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size}); -// engage_img = loadPixmap("../assets/navigation/nav-settings-square.png", {img_size, img_size}); - engage_img = loadPixmap("../assets/navigation/nav-settings-square-smaller.png", {img_size, img_size}); -// experimental_img = loadPixmap("../assets/img_experimental.svg", {img_size, img_size}); + settings_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size}); QObject::connect(this, &QPushButton::clicked, this, &MapSettingsButton::changeMode); } @@ -264,7 +259,7 @@ void MapSettingsButton::paintEvent(QPaintEvent *event) { p.setBrush(QColor(0, 0, 0, 166)); p.drawEllipse(center, btn_size / 2, btn_size / 2); p.setOpacity((isDown() || !engageable) ? 0.6 : 1.0); - p.drawPixmap((btn_size - img_size) / 2, (btn_size - img_size) / 2, engage_img); + p.drawPixmap((btn_size - img_size) / 2, (btn_size - img_size) / 2, settings_img); } diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h index b30cd6b060..bf5a01b4a5 100644 --- a/selfdrive/ui/qt/onroad.h +++ b/selfdrive/ui/qt/onroad.h @@ -60,8 +60,7 @@ private: void changeMode(); Params params; - QPixmap engage_img; -// QPixmap experimental_img; + QPixmap settings_img; bool experimental_mode; bool engageable; };