From 0958bd225349dd03a32708468def8dc1fe8b1021 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 9 Jun 2021 05:20:08 +0800 Subject: [PATCH] networking: draw network strength without images (#21187) * draw network strength wighout images * remove include qpixmap * space * lower case * cleanup --- selfdrive/assets/images/network_0.png | Bin 416 -> 0 bytes selfdrive/assets/images/network_1.png | Bin 462 -> 0 bytes selfdrive/assets/images/network_2.png | Bin 593 -> 0 bytes selfdrive/assets/images/network_3.png | Bin 524 -> 0 bytes selfdrive/assets/images/network_4.png | Bin 541 -> 0 bytes selfdrive/assets/images/network_5.png | Bin 503 -> 0 bytes selfdrive/ui/qt/offroad/networking.cc | 22 +++++++++++++++------- selfdrive/ui/qt/offroad/networking.h | 11 +++++++++++ 8 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 selfdrive/assets/images/network_0.png delete mode 100644 selfdrive/assets/images/network_1.png delete mode 100644 selfdrive/assets/images/network_2.png delete mode 100644 selfdrive/assets/images/network_3.png delete mode 100644 selfdrive/assets/images/network_4.png delete mode 100644 selfdrive/assets/images/network_5.png diff --git a/selfdrive/assets/images/network_0.png b/selfdrive/assets/images/network_0.png deleted file mode 100644 index 2ce959ca5f9b4e5b313d28449fdf86de7db5a362..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)(4&2r=>Cr>|28ttT zn4bnOQxei|()?MPHf0owC9ONS#cq{%*dd$8d+A~024Alyy}&j^RC9!gTu!>W77oSd zn&5I7a09})RB$mMX#t{=TR}45$;ZrcQbBzzbzV_%!G@$E9B?6rM2wbaAxTBWez}i}+#ssxomcLb&iJl)2JecTFQKP<3H<@|$5s!nMeIHR0000< KMNUMnLSTXug}12y diff --git a/selfdrive/assets/images/network_1.png b/selfdrive/assets/images/network_1.png deleted file mode 100644 index d7ae713f9090ce21671fa3149b0a58d383052281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^8-Q4vg&9cdIY~GGDU|@95LfpCpZ|n_NL6e)P(61^ zkY6x^yb!lk(IEo?QHwK6zDUU)m>00bgeN4^ z;4tHh%u7oS@_zSlc4l_>m^?G3&1w4MW}Y`Y7aG-_ApZ z+Fwq&U&-NR=~8R03%zeTncDJYn51Bo!Cc8a#zEQLDt7b?e*PQ4Rn(ktf ztxk?&|(O3I^?n!*v z@_%(pqc_9qPlps+j^x@rcX{mECKSY{+bQfTZ1zNl`RUU7^SHA^lOD!Di2Jm=aP3yySzE~y3+gk j!|hvc>~?ylTEaTTM(1`)R!$Kxz!^MU{an^LB{Ts5oA%uZ diff --git a/selfdrive/assets/images/network_2.png b/selfdrive/assets/images/network_2.png deleted file mode 100644 index 17ecd977f1ead753ee24a8a0b201c0fec61e5b8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^8-Q4vg&9cdIY~GGDT4r?5ZC|z|GO9X07)W&vT~?9 zP%nQ;kYBJogCMsA)A#2~gOl6N)by{Gou-StI6M2i ze~Va2QKl=a`fK)c*Yfz9G&uOg#MKvCa5Z&wN56cu?te?(qxc6)RySXW3V0k_v~$l% z*&AN(TchhLKdHQ*9V29*KTXfi@BHZ=mv_$|KKM9G(lGqsuO`Q=%O}=^Y8F1%ju2I< zxSun(x-jI*+jF!1Z++k5%~*FvV2i59Dk<$xJ;$YEjw}?r<8^80r4=laRvTj+E^Smg z|D%=tXb+6esUMvi$?9e#-z+}tWeIhv-mpCuUT&qYmxsvfqm+|f-~jk&ht5B>XH#89rz^IYggIVD}TI1ruOzKck#?J zxBtwVY!f6q%iL(}qmPqt(`*A6QRM*%G$_|fa@Tu4?|3i0NjK(BzoUEi_U@*y|JQjuQ~kp2(9)7}{ZfSBB&hJ&4tUW(@XS@+~zVn8wjW^n-s$ObT=_Zk-&1l(r|8n7du7?o~YD<#dSv&6WW8FJt zapzx8{USBZq~mdi?|>blHtr*HK)< zn-vqT9$V$&y1vkO)|RGY-a$S`W`C1RG`Ia;F8xmDmdKI;Vst0G}iBF>CA3 z|MhQ+-mO*We6sP(XA5H$#=zu%4aK*TJG`R~b~Kpk>R+0dHpNqZspHvN;HD$U!Sv?@Kl9;PeEudpm$B9!+?ZhnkwmvQ!|3mz-~7+lv_ zRkPSQ=l7mm5A(dxhiAOrep&HHVLs!h&pl149=VS?6PMP-9b13)x37(G`^xz(FKk5n z9sZUAbr%0H;a1XquBA_@f81&0~%(#v!2AN zsJd?M{PwRPv@VW^Cryxbn{$G&XZJ;&)3Pd4=g%;&u6(BFVdQ&MBb@0Ll~+4FCWD diff --git a/selfdrive/assets/images/network_5.png b/selfdrive/assets/images/network_5.png deleted file mode 100644 index fba67a95a5a786a95c0cd4d6f1009706b4630e60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^8-Q4vgBeJ^-t^TGNZAMYgt)pF`242;c=gVb02(Dy z666=mAl_dc^z_|#-UX)<+5WU;ZawFy7HWNaH3I`!dcLC`-)fUh7Yf631V5h-ef_yFw>eg|TmAEt#RL?S0#|!1 z)R*vH$j_xC=dGijtQZ>pHao9v_U*%G_o~jS<~RSobn?EpKhCFj7R47Y-}>y_;kS1! wZtcDtTakS%JMV1$zj&tg|MV|jm_I+h*6D_z%++;*z~E=_boFyt=akR{0FSEppa1{> diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index d38268213f..2b741a1fb7 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -3,11 +3,24 @@ #include #include #include -#include +#include #include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/util.h" + +void NetworkStrengthWidget::paintEvent(QPaintEvent* event) { + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); + p.setPen(Qt::NoPen); + const QColor gray(0x54, 0x54, 0x54); + for (int i = 0, x = 0; i < 5; ++i) { + p.setBrush(i < strength_ ? Qt::white : gray); + p.drawEllipse(x, 0, 15, 15); + x += 20; + } +} + // Networking functions Networking::Networking(QWidget* parent, bool show_advanced) : QWidget(parent), show_advanced(show_advanced){ @@ -202,14 +215,9 @@ void WifiUI::refresh() { ssid_label->setStyleSheet("font-size: 55px;"); hlayout->addWidget(ssid_label, 1, Qt::AlignLeft); - // TODO: don't use images for this // strength indicator unsigned int strength_scale = network.strength / 17; - QPixmap pix("../assets/images/network_" + QString::number(strength_scale) + ".png"); - QLabel *icon = new QLabel(); - icon->setPixmap(pix.scaledToWidth(100, Qt::SmoothTransformation)); - icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); - hlayout->addWidget(icon, 0, Qt::AlignRight); + hlayout->addWidget(new NetworkStrengthWidget(strength_scale), 0, Qt::AlignRight); // connect button QPushButton* btn = new QPushButton(network.security_type == SecurityType::UNSUPPORTED ? "Unsupported" : (network.connected == ConnectedType::CONNECTED ? "Connected" : (network.connected == ConnectedType::CONNECTING ? "Connecting" : "Connect"))); diff --git a/selfdrive/ui/qt/offroad/networking.h b/selfdrive/ui/qt/offroad/networking.h index 9fa1cfe884..68a6d7c558 100644 --- a/selfdrive/ui/qt/offroad/networking.h +++ b/selfdrive/ui/qt/offroad/networking.h @@ -11,6 +11,17 @@ #include "selfdrive/ui/qt/widgets/ssh_keys.h" #include "selfdrive/ui/qt/widgets/toggle.h" +class NetworkStrengthWidget : public QWidget { + Q_OBJECT + +public: + explicit NetworkStrengthWidget(int strength, QWidget* parent = nullptr) : strength_(strength), QWidget(parent) { setFixedSize(100, 15); } + +private: + void paintEvent(QPaintEvent* event) override; + int strength_ = 0; +}; + class WifiUI : public QWidget { Q_OBJECT