UI: show thermal status instead of ambient temp (#22041)

* no number

* space evenly
old-commit-hash: 084b932eeb

selfdrive/ui/qt/sidebar.cc

@@ -4,8 +4,8 @@
 
 #include "selfdrive/ui/qt/util.h"
 
-void Sidebar::drawMetric(QPainter &p, const QString &label, const QString &val, QColor c, int y) {
+void Sidebar::drawMetric(QPainter &p, const QString &label, QColor c, int y) {
-  const QRect rect = {30, y, 240, val.isEmpty() ? (label.contains("\n") ? 124 : 100) : 148};
+  const QRect rect = {30, y, 240, label.contains("\n") ? 124 : 100};
 
   p.setPen(Qt::NoPen);
   p.setBrush(QBrush(c));
@@ -20,16 +20,9 @@ void Sidebar::drawMetric(QPainter &p, const QString &label, const QString &val,
   p.drawRoundedRect(rect, 20, 20);
 
   p.setPen(QColor(0xff, 0xff, 0xff));
-  if (val.isEmpty()) {
+  configFont(p, "Open Sans", 35, "Bold");
-    configFont(p, "Open Sans", 35, "Bold");
+  const QRect r = QRect(rect.x() + 30, rect.y(), rect.width() - 40, rect.height());
-    const QRect r = QRect(rect.x() + 30, rect.y(), rect.width() - 40, rect.height());
+  p.drawText(r, Qt::AlignCenter, label);
-    p.drawText(r, Qt::AlignCenter, label);
-  } else {
-    configFont(p, "Open Sans", 58, "Bold");
-    p.drawText(rect.x() + 50, rect.y() + 71, val);
-    configFont(p, "Open Sans", 35, "Regular");
-    p.drawText(rect.x() + 50, rect.y() + 50 + 77, label);
-  }
 }
 
 Sidebar::Sidebar(QWidget *parent) : QFrame(parent) {
@@ -57,23 +50,23 @@ void Sidebar::updateState(const UIState &s) {
   int strength = (int)deviceState.getNetworkStrength();
   setProperty("netStrength", strength > 0 ? strength + 1 : 0);
 
-  ItemStatus connectstatus;
+  ItemStatus connectStatus;
   auto last_ping = deviceState.getLastAthenaPingTime();
   if (last_ping == 0) {
-    connectstatus = params.getBool("PrimeRedirected") ? ItemStatus{"NO\nPRIME", danger_color} : ItemStatus{"CONNECT\nOFFLINE", warning_color};
+    connectStatus = params.getBool("PrimeRedirected") ? ItemStatus{"NO\nPRIME", danger_color} : ItemStatus{"CONNECT\nOFFLINE", warning_color};
   } else {
-    connectstatus = nanos_since_boot() - last_ping < 80e9 ? ItemStatus{"CONNECT\nONLINE", good_color} : ItemStatus{"CONNECT\nERROR", danger_color};
+    connectStatus = nanos_since_boot() - last_ping < 80e9 ? ItemStatus{"CONNECT\nONLINE", good_color} : ItemStatus{"CONNECT\nERROR", danger_color};
   }
-  setProperty("connectStatus", QVariant::fromValue(connectstatus));
+  setProperty("connectStatus", QVariant::fromValue(connectStatus));
 
-  QColor tempColor = danger_color;
+  ItemStatus tempStatus = {"HIGH\nTEMP", danger_color};
   auto ts = deviceState.getThermalStatus();
   if (ts == cereal::DeviceState::ThermalStatus::GREEN) {
-    tempColor = good_color;
+    tempStatus = {"GOOD\nTEMP", good_color};
   } else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) {
-    tempColor = warning_color;
+    tempStatus = {"OK\nTEMP", warning_color};
   }
-  setProperty("tempStatus", QVariant::fromValue(ItemStatus{QString("%1°C").arg((int)deviceState.getAmbientTempC()), tempColor}));
+  setProperty("tempStatus", QVariant::fromValue(tempStatus));
 
   ItemStatus pandaStatus = {"VEHICLE\nONLINE", good_color};
   if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) {
@@ -112,7 +105,7 @@ void Sidebar::paintEvent(QPaintEvent *event) {
   p.drawText(r, Qt::AlignCenter, net_type);
 
   // metrics
-  drawMetric(p, "TEMP", temp_status.first, temp_status.second, 338);
+  drawMetric(p, temp_status.first, temp_status.second, 338);
-  drawMetric(p, panda_status.first, "", panda_status.second, 518);
+  drawMetric(p, panda_status.first, panda_status.second, 496);
-  drawMetric(p, connect_status.first, "", connect_status.second, 676);
+  drawMetric(p, connect_status.first, connect_status.second, 654);
 }

selfdrive/ui/qt/sidebar.h

@@ -30,7 +30,7 @@ public slots:
 protected:
   void paintEvent(QPaintEvent *event) override;
   void mouseReleaseEvent(QMouseEvent *event) override;
-  void drawMetric(QPainter &p, const QString &label, const QString &val, QColor c, int y);
+  void drawMetric(QPainter &p, const QString &label, QColor c, int y);
 
   QImage home_img, settings_img;
   const QMap<cereal::DeviceState::NetworkType, QString> network_type = {