add new CenterWidget, make sure msg_id is always valid

Author: deanlee

tools/cabana/binaryview.cc

@@ -107,7 +107,7 @@ 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);
     }
   });
 }
@@ -218,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;
@@ -253,7 +251,7 @@ 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->getSignals()) {
@@ -272,7 +270,7 @@ void BinaryViewModel::refresh() {
       }
     }
   } else {
-    row_count = can->lastMessage(*msg_id).dat.size();
+    row_count = can->lastMessage(msg_id).dat.size();
     items.resize(row_count * column_count);
   }
   endResetModel();
@@ -281,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.

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/detailwidget.cc

@@ -10,8 +10,7 @@
 // DetailWidget
 
 DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(charts), QWidget(parent) {
-  QWidget *main_widget = new QWidget(this);
-  QVBoxLayout *main_layout = new QVBoxLayout(main_widget);
+  QVBoxLayout *main_layout = new QVBoxLayout(this);
   main_layout->setContentsMargins(0, 0, 0, 0);
 
   // tabbar
@@ -65,10 +64,6 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart
   tab_widget->addTab(history_log = new LogsWidget(this), utils::icon("stopwatch"), "&Logs");
   main_layout->addWidget(tab_widget);
 
-  stacked_layout = new QStackedLayout(this);
-  stacked_layout->addWidget(new WelcomeWidget(this));
-  stacked_layout->addWidget(main_widget);
-
   QObject::connect(binary_view, &BinaryView::resizeSignal, signal_view->model, &SignalModel::resizeSignal);
   QObject::connect(binary_view, &BinaryView::addSignal, signal_view->model, &SignalModel::addSignal);
   QObject::connect(binary_view, &BinaryView::signalHovered, signal_view, &SignalView::signalHovered);
@@ -109,20 +104,8 @@ void DetailWidget::showTabBarContextMenu(const QPoint &pt) {
   }
 }
 
-void DetailWidget::removeAll() {
-  msg_id = std::nullopt;
-  stacked_layout->setCurrentIndex(0);
-  tabbar->blockSignals(true);
-  while (tabbar->count() > 0) {
-    tabbar->removeTab(0);
-  }
-  tabbar->blockSignals(false);
-}
-
 void DetailWidget::setMessage(const MessageId &message_id) {
-  if (message_id == msg_id) return;
-
-  msg_id = message_id;
+  if (std::exchange(msg_id, message_id) == message_id) return;
 
   tabbar->blockSignals(true);
   int index = tabbar->count() - 1;
@@ -138,24 +121,18 @@ void DetailWidget::setMessage(const MessageId &message_id) {
   tabbar->blockSignals(false);
 
   setUpdatesEnabled(false);
-
-  signal_view->setMessage(*msg_id);
-  binary_view->setMessage(*msg_id);
-  history_log->setMessage(*msg_id);
-
-  stacked_layout->setCurrentIndex(1);
+  signal_view->setMessage(msg_id);
+  binary_view->setMessage(msg_id);
+  history_log->setMessage(msg_id);
   refresh();
-
   setUpdatesEnabled(true);
 }
 
 void DetailWidget::refresh() {
-  if (!msg_id) return;
-
   QStringList warnings;
-  auto msg = dbc()->msg(*msg_id);
+  auto msg = dbc()->msg(msg_id);
   if (msg) {
-    if (msg->size != can->lastMessage(*msg_id).dat.size()) {
+    if (msg->size != can->lastMessage(msg_id).dat.size()) {
       warnings.push_back(tr("Message size (%1) is incorrect.").arg(msg->size));
     }
     for (auto s : binary_view->getOverlappingSignals()) {
@@ -165,7 +142,7 @@ void DetailWidget::refresh() {
     warnings.push_back(tr("Drag-Select in binary view to create new signal."));
   }
   remove_msg_act->setEnabled(msg != nullptr);
-  name_label->setText(msgName(*msg_id));
+  name_label->setText(msgName(msg_id));
 
   if (!warnings.isEmpty()) {
     warning_label->setText(warnings.join('\n'));
@@ -176,7 +153,7 @@ void DetailWidget::refresh() {
 
 void DetailWidget::updateState(const QHash<MessageId, CanData> *msgs) {
   time_label->setText(QString::number(can->currentSec(), 'f', 3));
-  if (!msg_id || (msgs && !msgs->contains(*msg_id)))
+  if ((msgs && !msgs->contains(msg_id)))
     return;
 
   if (tab_widget->currentIndex() == 0)
@@ -186,17 +163,16 @@ void DetailWidget::updateState(const QHash<MessageId, CanData> *msgs) {
 }
 
 void DetailWidget::editMsg() {
-  MessageId id = *msg_id;
-  auto msg = dbc()->msg(id);
-  int size = msg ? msg->size : can->lastMessage(id).dat.size();
-  EditMessageDialog dlg(id, msgName(id), size, this);
+  auto msg = dbc()->msg(msg_id);
+  int size = msg ? msg->size : can->lastMessage(msg_id).dat.size();
+  EditMessageDialog dlg(msg_id, msgName(msg_id), size, this);
   if (dlg.exec()) {
-    UndoStack::push(new EditMsgCommand(*msg_id, dlg.name_edit->text(), dlg.size_spin->value()));
+    UndoStack::push(new EditMsgCommand(msg_id, dlg.name_edit->text(), dlg.size_spin->value()));
   }
 }
 
 void DetailWidget::removeMsg() {
-  UndoStack::push(new RemoveMsgCommand(*msg_id));
+  UndoStack::push(new RemoveMsgCommand(msg_id));
 }
 
 // EditMessageDialog
@@ -242,10 +218,33 @@ void EditMessageDialog::validateName(const QString &text) {
   btn_box->button(QDialogButtonBox::Ok)->setEnabled(valid);
 }
 
-// WelcomeWidget
+// CenterWidget
 
-WelcomeWidget::WelcomeWidget(QWidget *parent) : QWidget(parent) {
+CenterWidget::CenterWidget(ChartsWidget *charts, QWidget *parent) : charts(charts), QWidget(parent) {
   QVBoxLayout *main_layout = new QVBoxLayout(this);
+  main_layout->addWidget(welcome_widget = createWelcomeWidget());
+}
+
+void CenterWidget::setMessage(const MessageId &msg_id) {
+  if (!detail_widget) {
+    delete welcome_widget;
+    welcome_widget = nullptr;
+    layout()->addWidget(detail_widget = new DetailWidget(charts, this));
+  }
+  detail_widget->setMessage(msg_id);
+}
+
+void CenterWidget::clear() {
+  delete detail_widget;
+  detail_widget = nullptr;
+  if (!welcome_widget) {
+    layout()->addWidget(welcome_widget = createWelcomeWidget());
+  }
+}
+
+QWidget *CenterWidget::createWelcomeWidget() {
+  QWidget *w = new QWidget(this);
+  QVBoxLayout *main_layout = new QVBoxLayout(w);
   main_layout->addStretch(0);
   QLabel *logo = new QLabel("CABANA");
   logo->setAlignment(Qt::AlignCenter);
@@ -270,7 +269,8 @@ WelcomeWidget::WelcomeWidget(QWidget *parent) : QWidget(parent) {
   main_layout->addLayout(newShortcutRow("WhatsThis", "Shift+F1"));
   main_layout->addStretch(0);
 
-  setStyleSheet("QLabel{color:darkGray;}");
-  setBackgroundRole(QPalette::Base);
-  setAutoFillBackground(true);
+  w->setStyleSheet("QLabel{color:darkGray;}");
+  w->setBackgroundRole(QPalette::Base);
+  w->setAutoFillBackground(true);
+  return w;
 }

tools/cabana/detailwidget.h

@@ -2,7 +2,6 @@
 
 #include <QDialogButtonBox>
 #include <QSplitter>
-#include <QStackedLayout>
 #include <QTabWidget>
 #include <QToolBar>
 
@@ -24,19 +23,13 @@ class EditMessageDialog : public QDialog {
   QSpinBox *size_spin;
 };
 
-class WelcomeWidget : public QWidget {
-public:
-  WelcomeWidget(QWidget *parent);
-};
-
 class DetailWidget : public QWidget {
   Q_OBJECT
 
 public:
   DetailWidget(ChartsWidget *charts, QWidget *parent);
   void setMessage(const MessageId &message_id);
   void refresh();
-  void removeAll();
   QSize minimumSizeHint() const override { return binary_view->minimumSizeHint(); }
 
 private:
@@ -45,7 +38,7 @@ class DetailWidget : public QWidget {
   void removeMsg();
   void updateState(const QHash<MessageId, CanData> * msgs = nullptr);
 
-  std::optional<MessageId> msg_id;
+  MessageId msg_id;
   QLabel *time_label, *warning_icon, *warning_label;
   ElidedLabel *name_label;
   QWidget *warning_widget;
@@ -57,5 +50,18 @@ class DetailWidget : public QWidget {
   SignalView *signal_view;
   ChartsWidget *charts;
   QSplitter *splitter;
-  QStackedLayout *stacked_layout;
+};
+
+class CenterWidget : public QWidget {
+  Q_OBJECT
+public:
+  CenterWidget(ChartsWidget* charts, QWidget *parent);
+  void setMessage(const MessageId &msg_id);
+  void clear();
+
+private:
+  QWidget *createWelcomeWidget();
+  DetailWidget *detail_widget = nullptr;
+  QWidget *welcome_widget = nullptr;
+  ChartsWidget *charts;
 };

tools/cabana/historylog.cc

@@ -30,7 +30,7 @@ void HistoryLogModel::setMessage(const MessageId &message_id) {
 void HistoryLogModel::refresh(bool fetch_message) {
   beginResetModel();
   sigs.clear();
-  if (auto dbc_msg = dbc()->msg(*msg_id)) {
+  if (auto dbc_msg = dbc()->msg(msg_id)) {
     sigs = dbc_msg->getSignals();
   }
   last_fetch_time = 0;
@@ -81,17 +81,15 @@ void HistoryLogModel::setFilter(int sig_idx, const QString &value, std::function
 }
 
 void HistoryLogModel::updateState() {
-  if (msg_id) {
-    uint64_t current_time = (can->lastMessage(*msg_id).ts + can->routeStartTime()) * 1e9 + 1;
-    auto new_msgs = dynamic_mode ? fetchData(current_time, last_fetch_time) : fetchData(0);
-    if (!new_msgs.empty()) {
-      beginInsertRows({}, 0, new_msgs.size() - 1);
-      messages.insert(messages.begin(), std::move_iterator(new_msgs.begin()), std::move_iterator(new_msgs.end()));
-      endInsertRows();
-    }
-    has_more_data = new_msgs.size() >= batch_size;
-    last_fetch_time = current_time;
+  uint64_t current_time = (can->lastMessage(msg_id).ts + can->routeStartTime()) * 1e9 + 1;
+  auto new_msgs = dynamic_mode ? fetchData(current_time, last_fetch_time) : fetchData(0);
+  if (!new_msgs.empty()) {
+    beginInsertRows({}, 0, new_msgs.size() - 1);
+    messages.insert(messages.begin(), std::move_iterator(new_msgs.begin()), std::move_iterator(new_msgs.end()));
+    endInsertRows();
   }
+  has_more_data = new_msgs.size() >= batch_size;
+  last_fetch_time = current_time;
 }
 
 void HistoryLogModel::fetchMore(const QModelIndex &parent) {
@@ -113,7 +111,7 @@ std::deque<HistoryLogModel::Message> HistoryLogModel::fetchData(InputIt first, I
   for (auto it = first; it != last && (*it)->mono_time > min_time; ++it) {
     if ((*it)->which == cereal::Event::Which::CAN) {
       for (const auto &c : (*it)->event.getCan()) {
-        if (msg_id->address == c.getAddress() && msg_id->source == c.getSrc()) {
+        if (msg_id.address == c.getAddress() && msg_id.source == c.getSrc()) {
           const auto dat = c.getDat();
           for (int i = 0; i < sigs.size(); ++i) {
             values[i] = get_raw_value((uint8_t *)dat.begin(), dat.size(), *sigs[i]);
@@ -138,7 +136,7 @@ template std::deque<HistoryLogModel::Message> HistoryLogModel::fetchData<>(std::
 
 std::deque<HistoryLogModel::Message> HistoryLogModel::fetchData(uint64_t from_time, uint64_t min_time) {
   auto events = can->events();
-  const auto freq = can->lastMessage(*msg_id).freq;
+  const auto freq = can->lastMessage(msg_id).freq;
   const bool update_colors = !display_signals_mode || sigs.empty();
 
   if (dynamic_mode) {
@@ -250,8 +248,6 @@ void LogsWidget::setMessage(const MessageId &message_id) {
 }
 
 void LogsWidget::refresh() {
-  if (!model->msg_id) return;
-
   model->setFilter(0, "", nullptr);
   model->refresh(isVisible());
   bool has_signal = model->sigs.size();

tools/cabana/historylog.h

@@ -1,8 +1,6 @@
 #pragma once
 
 #include <deque>
-#include <optional>
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QHeaderView>
@@ -55,7 +53,7 @@ public slots:
   std::deque<HistoryLogModel::Message> fetchData(InputIt first, InputIt last, uint64_t min_time);
   std::deque<Message> fetchData(uint64_t from_time, uint64_t min_time = 0);
 
-  std::optional<MessageId> msg_id;
+  MessageId msg_id;
   ChangeTracker hex_colors;
   bool has_more_data = true;
   const int batch_size = 50;

tools/cabana/mainwin.cc

@@ -27,8 +27,8 @@ void qLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const
 
 MainWindow::MainWindow() : QMainWindow() {
   createDockWindows();
-  detail_widget = new DetailWidget(charts_widget, this);
-  setCentralWidget(detail_widget);
+  center_widget = new CenterWidget(charts_widget, this);
+  setCentralWidget(center_widget);
   createActions();
   createStatusBar();
   createShortcuts();
@@ -60,7 +60,7 @@ MainWindow::MainWindow() : QMainWindow() {
 
   QObject::connect(this, &MainWindow::showMessage, statusBar(), &QStatusBar::showMessage);
   QObject::connect(this, &MainWindow::updateProgressBar, this, &MainWindow::updateDownloadProgress);
-  QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, detail_widget, &DetailWidget::setMessage);
+  QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, center_widget, &CenterWidget::setMessage);
   QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts);
   QObject::connect(can, &AbstractStream::streamStarted, this, &MainWindow::loadDBCFromFingerprint);
   QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &MainWindow::DBCFileChanged);
@@ -198,7 +198,7 @@ void MainWindow::DBCFileChanged() {
 void MainWindow::openRoute() {
   OpenRouteDialog dlg(this);
   if (dlg.exec()) {
-    detail_widget->removeAll();
+    center_widget->clear();
     charts_widget->removeAll();
     statusBar()->showMessage(tr("Route %1 loaded").arg(can->routeName()), 2000);
   } else if (dlg.failedToLoad()) {

tools/cabana/mainwin.h

@@ -59,7 +59,7 @@ public slots:
   VideoWidget *video_widget = nullptr;
   QDockWidget *video_dock;
   MessagesWidget *messages_widget;
-  DetailWidget *detail_widget;
+  CenterWidget *center_widget;
   ChartsWidget *charts_widget;
   QWidget *floating_window = nullptr;
   QVBoxLayout *charts_layout;