cabana: improve UI & fix bugs

tools/cabana/binaryview.cc

@@ -32,7 +32,6 @@ BinaryView::BinaryView(QWidget *parent) : QTableView(parent) {
   verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
   verticalHeader()->setDefaultSectionSize(CELL_HEIGHT);
   horizontalHeader()->hide();
-  setFrameShape(QFrame::NoFrame);
   setShowGrid(false);
   setMouseTracking(true);
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -44,17 +43,17 @@ BinaryView::BinaryView(QWidget *parent) : QTableView(parent) {
   setWhatsThis(R"(
     <b>Binary View</b><br/>
     <!-- TODO: add descprition here -->
-    Shortcuts:<br />
+    <span style="color:gray">Shortcuts</span><br />
     Delete Signal:
-      <span style="background-color:lightGray;color:gray"> x </span>,
-      <span style="background-color:lightGray;color:gray"> Backspace </span>,
-      <span style="background-color:lightGray;color:gray"> Delete</span><br />
-    Change endianness: <span style="background-color:lightGray;color:gray"> e </span><br />
-    Change singedness: <span style="background-color:lightGray;color:gray"> s </span><br />
+      <span style="background-color:lightGray;color:gray">&nbsp;x&nbsp;</span>,
+      <span style="background-color:lightGray;color:gray">&nbsp;Backspace&nbsp;</span>,
+      <span style="background-color:lightGray;color:gray">&nbsp;Delete&nbsp;</span><br />
+    Change endianness: <span style="background-color:lightGray;color:gray">&nbsp;e&nbsp; </span><br />
+    Change singedness: <span style="background-color:lightGray;color:gray">&nbsp;s&nbsp;</span><br />
     Open chart:
-      <span style="background-color:lightGray;color:gray"> c </span>,
-      <span style="background-color:lightGray;color:gray"> p </span>,
-      <span style="background-color:lightGray;color:gray"> g </span><br />
+      <span style="background-color:lightGray;color:gray">&nbsp;c&nbsp;</span>,
+      <span style="background-color:lightGray;color:gray">&nbsp;p&nbsp;</span>,
+      <span style="background-color:lightGray;color:gray">&nbsp;g&nbsp;</span>
   )");
 }
 
@@ -108,14 +107,14 @@ void BinaryView::addShortcuts() {
   QObject::connect(shortcut_plot_c, &QShortcut::activated, shortcut_plot, &QShortcut::activated);
   QObject::connect(shortcut_plot, &QShortcut::activated, [=]{
     if (hovered_sig != nullptr) {
-      emit showChart(*model->msg_id, hovered_sig, true, false);
+      emit showChart(model->msg_id, hovered_sig, true, false);
     }
   });
 }
 
 QSize BinaryView::minimumSizeHint() const {
-  return {(horizontalHeader()->minimumSectionSize() + 1) * 9 + VERTICAL_HEADER_WIDTH,
-          CELL_HEIGHT * std::min(model->rowCount(), 10)};
+  return {(horizontalHeader()->minimumSectionSize() + 1) * 9 + VERTICAL_HEADER_WIDTH + 2,
+          CELL_HEIGHT * std::min(model->rowCount(), 10) + 2};
 }
 
 void BinaryView::highlight(const Signal *sig) {
@@ -127,6 +126,16 @@ void BinaryView::highlight(const Signal *sig) {
         emit model->dataChanged(index, index, {Qt::DisplayRole});
       }
     }
+
+    if (sig && underMouse()) {
+      QString tooltip = tr(R"(%1<br /><span style="color:gray;font-size:small">
+        Size:%2 LE:%3 SGD:%4</span>
+      )").arg(sig->name).arg(sig->size).arg(sig->is_little_endian ? "Y" : "N").arg(sig->is_signed ? "Y" : "N");
+      QToolTip::showText(QCursor::pos(), tooltip, this, rect());
+    } else {
+      QToolTip::showText(QCursor::pos(), "", this, rect());
+    }
+
     hovered_sig = sig;
     emit signalHovered(hovered_sig);
   }
@@ -169,7 +178,6 @@ void BinaryView::highlightPosition(const QPoint &pos) {
     auto item = (BinaryViewModel::Item *)index.internalPointer();
     const Signal *sig = item->sigs.isEmpty() ? nullptr : item->sigs.back();
     highlight(sig);
-    QToolTip::showText(pos, sig ? sig->name : "", this, rect());
   }
 }
 
@@ -210,8 +218,6 @@ void BinaryView::setMessage(const MessageId &message_id) {
 }
 
 void BinaryView::refresh() {
-  if (!model->msg_id) return;
-
   clearSelection();
   anchor_index = QModelIndex();
   resize_sig = nullptr;
@@ -245,26 +251,26 @@ std::tuple<int, int, bool> BinaryView::getSelection(QModelIndex index) {
 void BinaryViewModel::refresh() {
   beginResetModel();
   items.clear();
-  if (auto dbc_msg = dbc()->msg(*msg_id)) {
+  if (auto dbc_msg = dbc()->msg(msg_id)) {
     row_count = dbc_msg->size;
     items.resize(row_count * column_count);
-    for (auto &sig : dbc_msg->sigs) {
-      auto [start, end] = getSignalRange(&sig);
+    for (auto sig : dbc_msg->getSignals()) {
+      auto [start, end] = getSignalRange(sig);
       for (int j = start; j <= end; ++j) {
-        int bit_index = sig.is_little_endian ? bigEndianBitIndex(j) : j;
+        int bit_index = sig->is_little_endian ? bigEndianBitIndex(j) : j;
         int idx = column_count * (bit_index / 8) + bit_index % 8;
         if (idx >= items.size()) {
-          qWarning() << "signal " << sig.name << "out of bounds.start_bit:" << sig.start_bit << "size:" << sig.size;
+          qWarning() << "signal " << sig->name << "out of bounds.start_bit:" << sig->start_bit << "size:" << sig->size;
           break;
         }
-        if (j == start) sig.is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true;
-        if (j == end) sig.is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true;
-        items[idx].bg_color = getColor(&sig);
-        items[idx].sigs.push_back(&sig);
+        if (j == start) sig->is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true;
+        if (j == end) sig->is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true;
+        items[idx].bg_color = getColor(sig);
+        items[idx].sigs.push_back(sig);
       }
     }
   } else {
-    row_count = can->lastMessage(*msg_id).dat.size();
+    row_count = can->lastMessage(msg_id).dat.size();
     items.resize(row_count * column_count);
   }
   endResetModel();
@@ -273,7 +279,7 @@ void BinaryViewModel::refresh() {
 
 void BinaryViewModel::updateState() {
   auto prev_items = items;
-  const auto &last_msg = can->lastMessage(*msg_id);
+  const auto &last_msg = can->lastMessage(msg_id);
   const auto &binary = last_msg.dat;
 
   // data size may changed.
@@ -283,33 +289,29 @@ void BinaryViewModel::updateState() {
     items.resize(row_count * column_count);
     endInsertRows();
   }
+
+  double max_f = 255.0;
+  double factor = 0.25;
+  double scaler = max_f / log2(1.0 + factor);
   char hex[3] = {'\0'};
   for (int i = 0; i < binary.size(); ++i) {
     for (int j = 0; j < 8; ++j) {
-      items[i * column_count + j].val = ((binary[i] >> (7 - j)) & 1) != 0 ? '1' : '0';
-
+      auto &item = items[i * column_count + j];
+      item.val = ((binary[i] >> (7 - j)) & 1) != 0 ? '1' : '0';
       // Bit update frequency based highlighting
-      bool has_signal = items[i * column_count + j].sigs.size() > 0;
-      double offset = has_signal ? 50 : 0;
-
-      double min_f = last_msg.bit_change_counts[i][7 - j] == 0 ? offset : offset + 25;
-      double max_f = 255.0;
-
-      double factor = 0.25;
-      double scaler = max_f / log2(1.0 + factor);
-
-      double alpha = std::clamp(offset + log2(1.0 + factor * (double)last_msg.bit_change_counts[i][7 - j] / (double)last_msg.count) * scaler, min_f, max_f);
-      items[i * column_count + j].bg_color.setAlpha(alpha);
+      double offset = !item.sigs.empty() ? 50 : 0;
+      auto n = last_msg.bit_change_counts[i][7 - j];
+      double min_f = n == 0 ? offset : offset + 25;
+      double alpha = std::clamp(offset + log2(1.0 + factor * (double)n / (double)last_msg.count) * scaler, min_f, max_f);
+      item.bg_color.setAlpha(alpha);
     }
     hex[0] = toHex(binary[i] >> 4);
     hex[1] = toHex(binary[i] & 0xf);
     items[i * column_count + 8].val = hex;
     items[i * column_count + 8].bg_color = last_msg.colors[i];
   }
-  for (int i = binary.size(); i < row_count; ++i) {
-    for (int j = 0; j < column_count; ++j) {
-      items[i * column_count + j].val = "-";
-    }
+  for (int i = binary.size() * column_count; i < items.size(); ++i) {
+    items[i].val = "-";
   }
 
   for (int i = 0; i < items.size(); ++i) {

tools/cabana/binaryview.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-
 #include <QApplication>
 #include <QList>
 #include <QSet>
@@ -50,7 +48,7 @@ class BinaryViewModel : public QAbstractTableModel {
   };
   std::vector<Item> items;
 
-  std::optional<MessageId> msg_id;
+  MessageId msg_id;
   int row_count = 0;
   const int column_count = 9;
 };

tools/cabana/chartswidget.cc

@@ -11,15 +11,16 @@
 #include <QRubberBand>
 #include <QPushButton>
 #include <QToolBar>
-#include <QToolButton>
 #include <QToolTip>
 #include <QtConcurrent>
 
 const int MAX_COLUMN_COUNT = 4;
 // ChartsWidget
 
-ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) {
+ChartsWidget::ChartsWidget(QWidget *parent) : QFrame(parent) {
+  setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
   QVBoxLayout *main_layout = new QVBoxLayout(this);
+  main_layout->setContentsMargins(0, 0, 0, 0);
 
   // toolbar
   QToolBar *toolbar = new QToolBar(tr("Charts"), this);
@@ -43,6 +44,7 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) {
 
   range_lb_action = toolbar->addWidget(range_lb = new QLabel(this));
   range_slider = new QSlider(Qt::Horizontal, this);
+  range_slider->setMaximumWidth(200);
   range_slider->setToolTip(tr("Set the chart range"));
   range_slider->setRange(1, settings.max_cached_minutes * 60);
   range_slider->setSingleStep(1);
@@ -67,6 +69,7 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) {
   charts_main_layout->addStretch(0);
 
   QScrollArea *charts_scroll = new QScrollArea(this);
+  charts_scroll->setFrameStyle(QFrame::NoFrame);
   charts_scroll->setWidgetResizable(true);
   charts_scroll->setWidget(charts_container);
   charts_scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -329,18 +332,12 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
   move_icon = new QGraphicsPixmapItem(utils::icon("grip-horizontal"), chart);
   move_icon->setToolTip(tr("Drag and drop to combine charts"));
 
-  QToolButton *remove_btn = new QToolButton();
-  remove_btn->setIcon(utils::icon("x"));
-  remove_btn->setAutoRaise(true);
-  remove_btn->setToolTip(tr("Remove Chart"));
+  QToolButton *remove_btn = toolButton("x", tr("Remove Chart"));
   close_btn_proxy = new QGraphicsProxyWidget(chart);
   close_btn_proxy->setWidget(remove_btn);
   close_btn_proxy->setZValue(chart->zValue() + 11);
 
-  QToolButton *manage_btn = new QToolButton();
-  manage_btn->setToolButtonStyle(Qt::ToolButtonIconOnly);
-  manage_btn->setIcon(utils::icon("list"));
-  manage_btn->setAutoRaise(true);
+  QToolButton *manage_btn = toolButton("list", "");
   QMenu *menu = new QMenu(this);
   line_series_action = menu->addAction(tr("Line"), [this]() { setSeriesType(QAbstractSeries::SeriesTypeLine); });
   line_series_action->setCheckable(true);
@@ -434,12 +431,12 @@ void ChartView::manageSeries() {
 }
 
 void ChartView::resizeEvent(QResizeEvent *event) {
-  QChartView::resizeEvent(event);
   updatePlotArea(align_to);
   int x = event->size().width() - close_btn_proxy->size().width() - 11;
   close_btn_proxy->setPos(x, 8);
   manage_btn_proxy->setPos(x - manage_btn_proxy->size().width() - 5, 8);
   move_icon->setPos(11, 8);
+  QChartView::resizeEvent(event);
 }
 
 void ChartView::updatePlotArea(int left) {
@@ -448,7 +445,7 @@ void ChartView::updatePlotArea(int left) {
     align_to = left;
     background->setRect(r);
     chart()->legend()->setGeometry(QRect(r.left(), r.top(), r.width(), 45));
-    chart()->setPlotArea(QRect(align_to, r.top() + 45, r.width() - align_to - 22, r.height() - 80));
+    chart()->setPlotArea(QRect(align_to, r.top() + 45, r.width() - align_to - 36, r.height() - 80));
     chart()->layout()->invalidate();
   }
 }
@@ -570,7 +567,7 @@ void ChartView::updateAxisY() {
 
     QFontMetrics fm(axis_y->labelsFont());
     int n = qMax(int(-qFloor(std::log10((max_y - min_y) / (tick_count - 1)))), 0) + 1;
-    y_label_width = qMax(fm.width(QString::number(min_y, 'f', n)), fm.width(QString::number(max_y, 'f', n))) + 20;  // left margin 20
+    y_label_width = qMax(fm.width(QString::number(min_y, 'f', n)), fm.width(QString::number(max_y, 'f', n))) + 15;  // left margin 15
     emit axisYLabelWidthChanged(y_label_width);
   }
 }
@@ -887,10 +884,10 @@ void SeriesSelector::updateAvailableList(int index) {
   available_list->clear();
   MessageId msg_id = msgs_combo->itemData(index).value<MessageId>();
   auto selected_items = seletedItems();
-  for (auto &s : dbc()->msg(msg_id)->sigs) {
-    bool is_selected = std::any_of(selected_items.begin(), selected_items.end(), [=, sig=&s](auto it) { return it->msg_id == msg_id && it->sig == sig; });
+  for (auto s : dbc()->msg(msg_id)->getSignals()) {
+    bool is_selected = std::any_of(selected_items.begin(), selected_items.end(), [=, sig=s](auto it) { return it->msg_id == msg_id && it->sig == sig; });
     if (!is_selected) {
-      addItemToList(available_list, msg_id, &s);
+      addItemToList(available_list, msg_id, s);
     }
   }
 }

tools/cabana/chartswidget.h

@@ -92,7 +92,7 @@ private slots:
   friend class ChartsWidget;
  };
 
-class ChartsWidget : public QWidget {
+class ChartsWidget : public QFrame {
   Q_OBJECT
 
 public:

tools/cabana/commands.cc

@@ -36,8 +36,8 @@ RemoveMsgCommand::RemoveMsgCommand(const MessageId &id, QUndoCommand *parent) :
 void RemoveMsgCommand::undo() {
   if (!message.name.isEmpty()) {
     dbc()->updateMsg(id, message.name, message.size);
-    for (auto &s : message.sigs)
-      dbc()->addSignal(id, s);
+    for (auto s : message.getSignals())
+      dbc()->addSignal(id, *s);
   }
 }