mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-06-28 01:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

cabana: add a combobox to switch between signal and raw hex value (#26974)

Browse Source 
* switch between hex&signal value

* sync display mode between view & model
old-commit-hash: 164880524a705fee3ba0507e70c7c0069b1f7ef0
This commit is contained in:
Dean Lee
2023-01-17 03:21:15 +08:00
committed by GitHub
parent d1cd31336c
commit e982122f90
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cabana/historylog.cc
+29 -7
View File
@@ -7,16 +7,24 @@
// HistoryLogModel
void HistoryLogModel::setDisplayType(HistoryLogModel::DisplayType type) {
if (display_type != type) {
display_type = type;
refresh();
}
}
QVariant HistoryLogModel::data(const QModelIndex &index, int role) const {
const bool display_signals = display_type == HistoryLogModel::Signals;
if (role == Qt::DisplayRole) {
const auto &m = messages[index.row()];
if (index.column() == 0) {
return QString::number((m.mono_time / (double)1e9) - can->routeStartTime(), 'f', 2);
}
return !sigs.empty() ? QString::number(m.sig_values[index.column() - 1]) : m.data;
} else if (role == Qt::FontRole && index.column() == 1 && sigs.empty()) {
return display_signals ? QString::number(m.sig_values[index.column() - 1]) : m.data;
} else if (role == Qt::FontRole && index.column() == 1 && !display_signals) {
return QFontDatabase::systemFont(QFontDatabase::FixedFont);
} else if (role == Qt::ToolTipRole && index.column() > 0 && !sigs.empty()) {
} else if (role == Qt::ToolTipRole && index.column() > 0 && display_signals) {
return tr("double click to open the chart");
}
return {};
@@ -28,6 +36,7 @@ void HistoryLogModel::setMessage(const QString &message_id) {
if (auto dbc_msg = dbc()->msg(msg_id)) {
sigs = dbc_msg->getSignals();
}
display_type = !sigs.empty() ? HistoryLogModel::Signals : HistoryLogModel::Hex;
filter_cmp = nullptr;
refresh();
}
@@ -41,15 +50,16 @@ void HistoryLogModel::refresh() {
}
QVariant HistoryLogModel::headerData(int section, Qt::Orientation orientation, int role) const {
const bool display_signals = display_type == HistoryLogModel::Signals && !sigs.empty();
if (orientation == Qt::Horizontal) {
if (role == Qt::DisplayRole || role == Qt::ToolTipRole) {
if (section == 0) {
return "Time";
}
return !sigs.empty() ? QString::fromStdString(sigs[section - 1]->name).replace('_', ' ') : "Data";
} else if (role == Qt::BackgroundRole && section > 0 && !sigs.empty()) {
return display_signals ? QString::fromStdString(sigs[section - 1]->name).replace('_', ' ') : "Data";
} else if (role == Qt::BackgroundRole && section > 0 && display_signals) {
return QBrush(QColor(getColor(section - 1)));
} else if (role == Qt::ForegroundRole && section > 0 && !sigs.empty()) {
} else if (role == Qt::ForegroundRole && section > 0 && display_signals) {
return QBrush(Qt::black);
}
}
@@ -182,6 +192,11 @@ LogsWidget::LogsWidget(QWidget *parent) : QWidget(parent) {
QVBoxLayout *main_layout = new QVBoxLayout(this);
QHBoxLayout *h = new QHBoxLayout();
display_type_cb = new QComboBox();
display_type_cb->addItems({"Signal value", "Hex value"});
h->addWidget(display_type_cb);
signals_cb = new QComboBox(this);
signals_cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
h->addWidget(signals_cb);
@@ -202,6 +217,7 @@ LogsWidget::LogsWidget(QWidget *parent) : QWidget(parent) {
main_layout->addWidget(logs);
QObject::connect(logs, &QTableView::doubleClicked, this, &LogsWidget::doubleClicked);
QObject::connect(display_type_cb, SIGNAL(activated(int)), this, SLOT(displayTypeChanged()));
QObject::connect(signals_cb, SIGNAL(activated(int)), this, SLOT(setFilter()));
QObject::connect(comp_box, SIGNAL(activated(int)), this, SLOT(setFilter()));
QObject::connect(value_edit, &QLineEdit::textChanged, this, &LogsWidget::setFilter);
@@ -222,6 +238,8 @@ void LogsWidget::setMessage(const QString &message_id) {
signals_cb->addItem(s->name.c_str());
}
}
display_type_cb->setCurrentIndex(has_signals ? 0 : 1);
display_type_cb->setVisible(has_signals);
comp_box->setVisible(has_signals);
value_edit->setVisible(has_signals);
signals_cb->setVisible(has_signals);
@@ -245,6 +263,10 @@ void LogsWidget::setFilter() {
cur_filter_text = value_edit->text();
}
void LogsWidget::displayTypeChanged() {
model->setDisplayType(display_type_cb->currentIndex() == 0 ? HistoryLogModel::Signals : HistoryLogModel::Hex);
}
void LogsWidget::showEvent(QShowEvent *event) {
if (dynamic_mode->isChecked()) {
model->refresh();
@@ -259,7 +281,7 @@ void LogsWidget::updateState() {
void LogsWidget::doubleClicked(const QModelIndex &index) {
if (index.isValid()) {
if (model->sigs.size() > 0 && index.column() > 0) {
if (model->display_type == HistoryLogModel::Signals && model->sigs.size() > 0 && index.column() > 0) {
emit openChart(model->msg_id, model->sigs[index.column()-1]);
}
can->seekTo(model->messages[index.row()].mono_time / (double)1e9 - can->routeStartTime());
tools/cabana/historylog.h
+12 -2
View File
@@ -21,16 +21,24 @@ class HistoryLogModel : public QAbstractTableModel {
Q_OBJECT
public:
enum DisplayType {
Signals,
Hex
};
HistoryLogModel(QObject *parent) : QAbstractTableModel(parent) {}
void setMessage(const QString &message_id);
void updateState();
void setFilter(int sig_idx, const QString &value, std::function<bool(double, double)> cmp);
void setDisplayType(DisplayType type);
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
void fetchMore(const QModelIndex &parent) override;
inline bool canFetchMore(const QModelIndex &parent) const override { return has_more_data; }
int rowCount(const QModelIndex &parent = QModelIndex()) const override { return messages.size(); }
int columnCount(const QModelIndex &parent = QModelIndex()) const override { return std::max(1ul, sigs.size()) + 1; }
int columnCount(const QModelIndex &parent = QModelIndex()) const override {
return display_type == HistoryLogModel::Hex ? 2 : std::max(1ul, sigs.size()) + 1;
}
void setDynamicMode(int state);
void segmentsMerged();
void refresh();
@@ -55,6 +63,7 @@ public:
std::deque<Message> messages;
std::vector<const Signal*> sigs;
bool dynamic_mode = false;
DisplayType display_type = HistoryLogModel::Signals;
};
class HistoryLog : public QTableView {
@@ -76,6 +85,7 @@ signals:
private slots:
void setFilter();
void displayTypeChanged();
private:
void doubleClicked(const QModelIndex &index);
@@ -84,7 +94,7 @@ private:
HistoryLog *logs;
HistoryLogModel *model;
QCheckBox *dynamic_mode;
QComboBox *signals_cb, *comp_box;
QComboBox *signals_cb, *comp_box, *display_type_cb;
QLineEdit *value_edit;
QString cur_filter_text;
};