From af6892d118d0b826faeee8961016a1406877549e Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Fri, 17 Feb 2023 10:53:12 +0800
Subject: [PATCH] cabana: simplify conversions between QVariant and
 QVector<QColor> (#27367)

old-commit-hash: 37adf5d3a681daac2542270a24897ae00d42e4b8
---
 tools/cabana/historylog.cc     |  2 +-
 tools/cabana/messageswidget.cc | 16 +++++++---------
 tools/cabana/util.cc           | 25 ++++++-------------------
 tools/cabana/util.h            |  1 -
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc
index f7f02b06d8..87968d495c 100644
--- a/tools/cabana/historylog.cc
+++ b/tools/cabana/historylog.cc
@@ -17,7 +17,7 @@ QVariant HistoryLogModel::data(const QModelIndex &index, int role) const {
     }
     return show_signals ? QString::number(m.sig_values[index.column() - 1]) : toHex(m.data);
   } else if (role == Qt::UserRole && index.column() == 1 && !show_signals) {
-    return ChangeTracker::toVariantList(m.colors);
+    return QVariant::fromValue(m.colors);
   }
   return {};
 }
diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc
index 1cf85ed740..81ebc6af20 100644
--- a/tools/cabana/messageswidget.cc
+++ b/tools/cabana/messageswidget.cc
@@ -121,17 +121,15 @@ QVariant MessageListModel::data(const QModelIndex &index, int role) const {
       case 4: return toHex(can_data.dat);
     }
   } else if (role == Qt::UserRole && index.column() == 4) {
-    QList<QVariant> colors;
-    colors.reserve(can_data.dat.size());
-    for (int i = 0; i < can_data.dat.size(); i++){
-      if (suppressed_bytes.contains({id, i})) {
-        colors.append(QColor(255, 255, 255, 0));
-      } else {
-        colors.append(i < can_data.colors.size() ? can_data.colors[i] : QColor(255, 255, 255, 0));
+    QVector<QColor> colors = can_data.colors;
+    if (!suppressed_bytes.empty()) {
+      for (int i = 0; i < colors.size(); i++) {
+        if (suppressed_bytes.contains({id, i})) {
+          colors[i] = QColor(255, 255, 255, 0);
+        }
       }
     }
-    return colors;
-
+    return QVariant::fromValue(colors);
   }
   return {};
 }
diff --git a/tools/cabana/util.cc b/tools/cabana/util.cc
index 454dd29b87..9843a3f00c 100644
--- a/tools/cabana/util.cc
+++ b/tools/cabana/util.cc
@@ -66,13 +66,6 @@ void ChangeTracker::clear() {
   colors.clear();
 }
 
-QList<QVariant> ChangeTracker::toVariantList(const QVector<QColor> &colors) {
-  QList<QVariant> ret;
-  ret.reserve(colors.size());
-  for (auto &c : colors) ret.append(c);
-  return ret;
-}
-
 // MessageBytesDelegate
 
 MessageBytesDelegate::MessageBytesDelegate(QObject *parent) : QStyledItemDelegate(parent) {
@@ -89,12 +82,8 @@ void MessageBytesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     return;
   }
 
-  if ((option.state & QStyle::State_Selected) && (option.state & QStyle::State_Active)) {
-    painter->setPen(option.palette.color(QPalette::HighlightedText));
-  } else {
-    painter->setPen(option.palette.color(QPalette::Text));
-  }
-
+  auto color_role = option.state & QStyle::State_Selected ? QPalette::HighlightedText: QPalette::Text;
+  painter->setPen(option.palette.color(color_role));
   painter->setFont(fixed_font);
   QRect space = painter->boundingRect(opt.rect, opt.displayAlignment, " ");
   QRect pos = painter->boundingRect(opt.rect, opt.displayAlignment, "00");
@@ -103,15 +92,13 @@ void MessageBytesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
   int m = space.width() / 2;
   const QMargins margins(m, m, m, m);
 
-  QList<QVariant> colors = index.data(Qt::UserRole).toList();
-  int i = 0;
-  for (auto &byte : byte_list) {
+  auto colors = index.data(Qt::UserRole).value<QVector<QColor>>();
+  for (int i = 0; i < byte_list.size(); ++i) {
     if (i < colors.size()) {
-      painter->fillRect(pos.marginsAdded(margins), colors[i].value<QColor>());
+      painter->fillRect(pos.marginsAdded(margins), colors[i]);
     }
-    painter->drawText(pos, opt.displayAlignment, byte);
+    painter->drawText(pos, opt.displayAlignment, byte_list[i]);
     pos.moveLeft(pos.right() + space.width());
-    i++;
   }
 }
 
diff --git a/tools/cabana/util.h b/tools/cabana/util.h
index 8ec4cda90c..eb5203fb0b 100644
--- a/tools/cabana/util.h
+++ b/tools/cabana/util.h
@@ -14,7 +14,6 @@
 class ChangeTracker {
 public:
   void compute(const QByteArray &dat, double ts, uint32_t freq);
-  static QList<QVariant> toVariantList(const QVector<QColor> &colors);
   void clear();
 
   QVector<double> last_change_t;