networking: draw network strength without images (#21187)

* draw network strength wighout images

* remove include qpixmap

* space

* lower case

* cleanup
old-commit-hash: 0958bd2253
commatwo_master
Dean Lee 4 years ago committed by GitHub
parent 7e5def641e
commit e81079461f
  1. 3
      selfdrive/assets/images/network_0.png
  2. 3
      selfdrive/assets/images/network_1.png
  3. 3
      selfdrive/assets/images/network_2.png
  4. 3
      selfdrive/assets/images/network_3.png
  5. 3
      selfdrive/assets/images/network_4.png
  6. 3
      selfdrive/assets/images/network_5.png
  7. 22
      selfdrive/ui/qt/offroad/networking.cc
  8. 11
      selfdrive/ui/qt/offroad/networking.h

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3bafba8ccc7166a430c4147159da31c989b4c1343585df90a6d60b6ca53fd3da
size 416

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a202db2a98d2564926d45fa1b890a62ed902a4246359ff4a96df1336d0d7569e
size 462

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b2f5efdcb4c4d0fa3620e12c4aec2a4bf250ce72d2cf93ee34e754c7e055c71
size 593

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74b690ab1f789f7a3ad0182e79f47c40f3145e586efb82582842dc3e4d375274
size 524

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a0109067d5ba99087d0678b1b2d5e9b90ae63b2750b06c8c497a073d111ca15
size 541

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:827996c0c1f975dde1818ad66155c7564aa37a6019b841d3070b038c3e6d2860
size 503

@ -3,11 +3,24 @@
#include <QDebug> #include <QDebug>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QPixmap> #include <QPainter>
#include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/widgets/scrollview.h"
#include "selfdrive/ui/qt/util.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 functions
Networking::Networking(QWidget* parent, bool show_advanced) : QWidget(parent), show_advanced(show_advanced){ 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;"); ssid_label->setStyleSheet("font-size: 55px;");
hlayout->addWidget(ssid_label, 1, Qt::AlignLeft); hlayout->addWidget(ssid_label, 1, Qt::AlignLeft);
// TODO: don't use images for this
// strength indicator // strength indicator
unsigned int strength_scale = network.strength / 17; unsigned int strength_scale = network.strength / 17;
QPixmap pix("../assets/images/network_" + QString::number(strength_scale) + ".png"); hlayout->addWidget(new NetworkStrengthWidget(strength_scale), 0, Qt::AlignRight);
QLabel *icon = new QLabel();
icon->setPixmap(pix.scaledToWidth(100, Qt::SmoothTransformation));
icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
hlayout->addWidget(icon, 0, Qt::AlignRight);
// connect button // connect button
QPushButton* btn = new QPushButton(network.security_type == SecurityType::UNSUPPORTED ? "Unsupported" : (network.connected == ConnectedType::CONNECTED ? "Connected" : (network.connected == ConnectedType::CONNECTING ? "Connecting" : "Connect"))); QPushButton* btn = new QPushButton(network.security_type == SecurityType::UNSUPPORTED ? "Unsupported" : (network.connected == ConnectedType::CONNECTED ? "Connected" : (network.connected == ConnectedType::CONNECTING ? "Connecting" : "Connect")));

@ -11,6 +11,17 @@
#include "selfdrive/ui/qt/widgets/ssh_keys.h" #include "selfdrive/ui/qt/widgets/ssh_keys.h"
#include "selfdrive/ui/qt/widgets/toggle.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 { class WifiUI : public QWidget {
Q_OBJECT Q_OBJECT

Loading…
Cancel
Save