sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cabana: cleanup historylog and fix some known issues (#27100)

Browse Source 
improve history logs
old-commit-hash: 0f37ff6c02
beeps
Dean Lee 2 years ago committed by GitHub
parent d8edb6962d
commit 7f350927d1
2 changed files with 60 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 156
      tools/cabana/historylog.cc
  2. 35
      tools/cabana/historylog.h

156
tools/cabana/historylog.cc
Unescape View File

@ -1,30 +1,20 @@
#include "tools/cabana/historylog.h"
#include <QFontDatabase>
#include <QPainter>
#include <QPushButton>
#include <QVBoxLayout>
// 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;
const bool show_signals = display_signals_mode && sigs.size() > 0;
const auto &m = messages[index.row()];
if (role == Qt::DisplayRole) {
if (index.column() == 0) {
return QString::number((m.mono_time / (double)1e9) - can->routeStartTime(), 'f', 2);
}
return display_signals ? QString::number(m.sig_values[index.column() - 1]) : toHex(m.data);
} else if (role == Qt::ToolTipRole && index.column() > 0 && display_signals) {
return tr("double click to open the chart");
} else if (role == Qt::UserRole && index.column() == 1 && !display_signals) {
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 HexColors::toVariantList(m.colors);
}
return {};
@ -36,7 +26,6 @@ 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();
}
@ -51,17 +40,15 @@ 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) {
const bool show_signals = display_signals_mode && !sigs.empty();
if (role == Qt::DisplayRole || role == Qt::ToolTipRole) {
if (section == 0) {
return "Time";
}
return display_signals ? QString::fromStdString(sigs[section - 1]->name).replace('_', ' ') : "Data";
} else if (role == Qt::BackgroundRole && section > 0 && display_signals) {
return show_signals ? QString::fromStdString(sigs[section - 1]->name).replace('_', ' ') : "Data";
} else if (role == Qt::BackgroundRole && section > 0 && show_signals) {
return QBrush(QColor(getColor(section - 1)));
} else if (role == Qt::ForegroundRole && section > 0 && display_signals) {
return QBrush(Qt::black);
}
}
return {};
@ -72,6 +59,11 @@ void HistoryLogModel::setDynamicMode(int state) {
refresh();
}
void HistoryLogModel::setDisplayType(int type) {
display_signals_mode = type == 0;
refresh();
}
void HistoryLogModel::segmentsMerged() {
if (!dynamic_mode) {
has_more_data = true;
@ -114,7 +106,7 @@ void HistoryLogModel::fetchMore(const QModelIndex &parent) {
}
void HistoryLogModel::updateColors() {
if (display_type == HistoryLogModel::Hex) {
if (!display_signals_mode || sigs.empty()) {
const auto freq = can->lastMessage(msg_id).freq;
if (dynamic_mode) {
for (auto it = messages.rbegin(); it != messages.rend(); ++it) {
@ -162,10 +154,9 @@ 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();
if (dynamic_mode) {
auto it = std::lower_bound(events->rbegin(), events->rend(), from_time, [=](auto &e, uint64_t ts) {
return e->mono_time > ts;
auto it = std::upper_bound(events->rbegin(), events->rend(), from_time, [=](uint64_t ts, auto &e) {
return e->mono_time < ts;
});
if (it != events->rend()) ++it;
return fetchData(it, events->rend(), min_time);
} else {
assert(min_time == 0);
@ -189,128 +180,77 @@ QSize HeaderView::sectionSizeFromContents(int logicalIndex) const {
void HeaderView::paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const {
auto bg_role = model()->headerData(logicalIndex, Qt::Horizontal, Qt::BackgroundRole);
if (bg_role.isValid()) {
QPen pen(model()->headerData(logicalIndex, Qt::Horizontal, Qt::ForegroundRole).value<QBrush>(), 1);
painter->setPen(pen);
painter->fillRect(rect, bg_role.value<QBrush>());
}
QString text = model()->headerData(logicalIndex, Qt::Horizontal, Qt::DisplayRole).toString();
painter->drawText(rect.adjusted(5, 3, -5, -3), defaultAlignment(), text);
}
// HistoryLog
HistoryLog::HistoryLog(QWidget *parent) : QTableView(parent) {
setHorizontalHeader(new HeaderView(Qt::Horizontal, this));
horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | (Qt::Alignment)Qt::TextWordWrap);
horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
verticalHeader()->setVisible(false);
setItemDelegateForColumn(1, new MessageBytesDelegate(this));
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
}
// LogsWidget
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);
comp_box = new QComboBox();
filters_widget = new QWidget(this);
QHBoxLayout *filter_layout = new QHBoxLayout(filters_widget);
filter_layout->setContentsMargins(0, 0, 0, 0);
filter_layout->addWidget(display_type_cb = new QComboBox(this));
filter_layout->addWidget(signals_cb = new QComboBox(this));
filter_layout->addWidget(comp_box = new QComboBox(this));
filter_layout->addWidget(value_edit = new QLineEdit(this));
h->addWidget(filters_widget);
h->addStretch(0);
h->addWidget(dynamic_mode = new QCheckBox(tr("Dynamic")), 0, Qt::AlignRight);
display_type_cb->addItems({"Signal Value", "Hex Value"});
comp_box->addItems({">", "=", "!=", "<"});
h->addWidget(comp_box);
value_edit = new QLineEdit(this);
value_edit->setClearButtonEnabled(true);
value_edit->setValidator(new QDoubleValidator(-500000, 500000, 6, this));
h->addWidget(value_edit);
dynamic_mode = new QCheckBox(tr("Dynamic"));
h->addWidget(dynamic_mode, 0, Qt::AlignRight);
main_layout->addLayout(h);
model = new HistoryLogModel(this);
logs = new HistoryLog(this);
logs->setModel(model);
main_layout->addWidget(logs);
dynamic_mode->setChecked(true);
dynamic_mode->setEnabled(!can->liveStreaming());
QObject::connect(logs, &QTableView::doubleClicked, this, &LogsWidget::doubleClicked);
QObject::connect(display_type_cb, SIGNAL(activated(int)), this, SLOT(displayTypeChanged()));
main_layout->addLayout(h);
main_layout->addWidget(logs = new QTableView(this));
logs->setModel(model = new HistoryLogModel(this));
logs->setItemDelegateForColumn(1, new MessageBytesDelegate(this));
logs->setHorizontalHeader(new HeaderView(Qt::Horizontal, this));
logs->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | (Qt::Alignment)Qt::TextWordWrap);
logs->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
logs->verticalHeader()->setVisible(false);
QObject::connect(display_type_cb, SIGNAL(activated(int)), model, SLOT(setDisplayType(int)));
QObject::connect(dynamic_mode, &QCheckBox::stateChanged, model, &HistoryLogModel::setDynamicMode);
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);
QObject::connect(dynamic_mode, &QCheckBox::stateChanged, model, &HistoryLogModel::setDynamicMode);
QObject::connect(can, &AbstractStream::seekedTo, model, &HistoryLogModel::refresh);
QObject::connect(can, &AbstractStream::eventsMerged, model, &HistoryLogModel::segmentsMerged);
dynamic_mode->setChecked(true);
if (can->liveStreaming()) {
dynamic_mode->setEnabled(false);
}
}
void LogsWidget::setMessage(const QString &message_id) {
model->setMessage(message_id);
cur_filter_text = "";
value_edit->setText("");
signals_cb->clear();
comp_box->setCurrentIndex(0);
bool has_signals = model->sigs.size() > 0;
if (has_signals) {
bool has_signal = model->sigs.size();
if (has_signal) {
signals_cb->clear();
for (auto s : model->sigs) {
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);
value_edit->clear();
comp_box->setCurrentIndex(0);
filters_widget->setVisible(has_signal);
}
static bool not_equal(double l, double r) { return l != r; }
void LogsWidget::setFilter() {
if (cur_filter_text.isEmpty() && value_edit->text().isEmpty()) {
return;
}
if (value_edit->text().isEmpty() && !value_edit->isModified()) return;
std::function<bool(double, double)> cmp;
std::function<bool(double, double)> cmp = nullptr;
switch (comp_box->currentIndex()) {
case 0: cmp = std::greater<double>{}; break;
case 1: cmp = std::equal_to<double>{}; break;
case 2: cmp = not_equal; break;
case 2: cmp = [](double l, double r) { return l != r; }; break; // not equal
case 3: cmp = std::less<double>{}; break;
}
model->setFilter(signals_cb->currentIndex(), value_edit->text(), cmp);
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();
}
}
void LogsWidget::updateState() {
if (dynamic_mode->isChecked()) {
model->updateState();
}
}
void LogsWidget::doubleClicked(const QModelIndex &index) {
if (index.isValid()) {
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());
}
}

35
tools/cabana/historylog.h
Unescape View File

@ -21,29 +21,27 @@ 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 display_type == HistoryLogModel::Hex ? 2 : std::max(1ul, sigs.size()) + 1;
return display_signals_mode && !sigs.empty() ? sigs.size() + 1 : 2;
}
void setDynamicMode(int state);
void segmentsMerged();
void updateColors();
void refresh();
public slots:
void setDisplayType(int type);
void setDynamicMode(int state);
void segmentsMerged();
public:
struct Message {
uint64_t mono_time = 0;
QVector<double> sig_values;
@ -66,13 +64,7 @@ public:
std::deque<Message> messages;
std::vector<const Signal*> sigs;
bool dynamic_mode = true;
DisplayType display_type = HistoryLogModel::Signals;
};
class HistoryLog : public QTableView {
public:
HistoryLog(QWidget *parent);
int sizeHintForColumn(int column) const override { return -1; };
bool display_signals_mode = true;
};
class LogsWidget : public QWidget {
@ -81,23 +73,20 @@ class LogsWidget : public QWidget {
public:
LogsWidget(QWidget *parent);
void setMessage(const QString &message_id);
void updateState();
void updateState() {if (dynamic_mode->isChecked()) model->updateState(); }
void showEvent(QShowEvent *event) override { if (dynamic_mode->isChecked()) model->refresh(); }
signals:
void openChart(const QString &msg_id, const Signal *sig);
private slots:
void setFilter();
void displayTypeChanged();
private:
void doubleClicked(const QModelIndex &index);
void showEvent(QShowEvent *event) override;
HistoryLog *logs;
QTableView *logs;
HistoryLogModel *model;
QCheckBox *dynamic_mode;
QComboBox *signals_cb, *comp_box, *display_type_cb;
QLineEdit *value_edit;
QString cur_filter_text;
QWidget *filters_widget;
};

Write Preview
Loading…
Cancel
Save