|
|
|
@ -1,8 +1,8 @@ |
|
|
|
#include "tools/cabana/chartswidget.h" |
|
|
|
#include "tools/cabana/chartswidget.h" |
|
|
|
|
|
|
|
|
|
|
|
#include <QGraphicsLayout> |
|
|
|
#include <QGraphicsLayout> |
|
|
|
#include <QLabel> |
|
|
|
|
|
|
|
#include <QRubberBand> |
|
|
|
#include <QRubberBand> |
|
|
|
|
|
|
|
#include <QTimer> |
|
|
|
#include <QtCharts/QLineSeries> |
|
|
|
#include <QtCharts/QLineSeries> |
|
|
|
#include <QtCharts/QValueAxis> |
|
|
|
#include <QtCharts/QValueAxis> |
|
|
|
|
|
|
|
|
|
|
|
@ -14,6 +14,7 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { |
|
|
|
|
|
|
|
|
|
|
|
// title bar
|
|
|
|
// title bar
|
|
|
|
title_bar = new QWidget(this); |
|
|
|
title_bar = new QWidget(this); |
|
|
|
|
|
|
|
title_bar->setVisible(false); |
|
|
|
QHBoxLayout *title_layout = new QHBoxLayout(title_bar); |
|
|
|
QHBoxLayout *title_layout = new QHBoxLayout(title_bar); |
|
|
|
title_layout->setContentsMargins(0, 0, 0, 0); |
|
|
|
title_layout->setContentsMargins(0, 0, 0, 0); |
|
|
|
title_label = new QLabel(tr("Charts")); |
|
|
|
title_label = new QLabel(tr("Charts")); |
|
|
|
@ -25,13 +26,11 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { |
|
|
|
title_layout->addWidget(range_label); |
|
|
|
title_layout->addWidget(range_label); |
|
|
|
|
|
|
|
|
|
|
|
reset_zoom_btn = new QPushButton("⟲", this); |
|
|
|
reset_zoom_btn = new QPushButton("⟲", this); |
|
|
|
reset_zoom_btn->setVisible(false); |
|
|
|
|
|
|
|
reset_zoom_btn->setFixedSize(30, 30); |
|
|
|
reset_zoom_btn->setFixedSize(30, 30); |
|
|
|
reset_zoom_btn->setToolTip(tr("Reset zoom (drag on chart to zoom X-Axis)")); |
|
|
|
reset_zoom_btn->setToolTip(tr("Reset zoom (drag on chart to zoom X-Axis)")); |
|
|
|
title_layout->addWidget(reset_zoom_btn); |
|
|
|
title_layout->addWidget(reset_zoom_btn); |
|
|
|
|
|
|
|
|
|
|
|
remove_all_btn = new QPushButton("✖", this); |
|
|
|
remove_all_btn = new QPushButton("✖", this); |
|
|
|
remove_all_btn->setVisible(false); |
|
|
|
|
|
|
|
remove_all_btn->setToolTip(tr("Remove all charts")); |
|
|
|
remove_all_btn->setToolTip(tr("Remove all charts")); |
|
|
|
remove_all_btn->setFixedSize(30, 30); |
|
|
|
remove_all_btn->setFixedSize(30, 30); |
|
|
|
title_layout->addWidget(remove_all_btn); |
|
|
|
title_layout->addWidget(remove_all_btn); |
|
|
|
@ -56,10 +55,20 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { |
|
|
|
|
|
|
|
|
|
|
|
main_layout->addWidget(charts_scroll); |
|
|
|
main_layout->addWidget(charts_scroll); |
|
|
|
|
|
|
|
|
|
|
|
updateTitleBar(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartsWidget::removeChart); |
|
|
|
|
|
|
|
QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &ChartsWidget::removeAll); |
|
|
|
QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &ChartsWidget::removeAll); |
|
|
|
|
|
|
|
QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartsWidget::removeChart); |
|
|
|
|
|
|
|
QObject::connect(dbc(), &DBCManager::signalUpdated, [this](const Signal *sig) { |
|
|
|
|
|
|
|
if (auto it = charts.find(sig); it != charts.end()) { |
|
|
|
|
|
|
|
it.value()->chart_view->updateSeries(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
QObject::connect(dbc(), &DBCManager::msgUpdated, [this](const QString &id) { |
|
|
|
|
|
|
|
for (auto chart : charts) { |
|
|
|
|
|
|
|
if (chart->id == id) |
|
|
|
|
|
|
|
chart->updateTitle(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
QObject::connect(can, &CANMessages::rangeChanged, [this]() { updateTitleBar(); }); |
|
|
|
QObject::connect(can, &CANMessages::rangeChanged, [this]() { updateTitleBar(); }); |
|
|
|
QObject::connect(reset_zoom_btn, &QPushButton::clicked, can, &CANMessages::resetRange); |
|
|
|
QObject::connect(reset_zoom_btn, &QPushButton::clicked, can, &CANMessages::resetRange); |
|
|
|
QObject::connect(remove_all_btn, &QPushButton::clicked, this, &ChartsWidget::removeAll); |
|
|
|
QObject::connect(remove_all_btn, &QPushButton::clicked, this, &ChartsWidget::removeAll); |
|
|
|
@ -68,57 +77,51 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { |
|
|
|
docking = !docking; |
|
|
|
docking = !docking; |
|
|
|
updateTitleBar(); |
|
|
|
updateTitleBar(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
QObject::connect(&settings, &Settings::changed, [this]() { |
|
|
|
|
|
|
|
for (auto chart : charts) { |
|
|
|
|
|
|
|
chart->setHeight(settings.chart_height); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartsWidget::updateTitleBar() { |
|
|
|
void ChartsWidget::updateTitleBar() { |
|
|
|
if (!charts.size()) { |
|
|
|
title_bar->setVisible(!charts.isEmpty()); |
|
|
|
title_bar->setVisible(false); |
|
|
|
if (charts.isEmpty()) return; |
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
title_label->setText(tr("Charts (%1)").arg(charts.size())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// show select range
|
|
|
|
// show select range
|
|
|
|
|
|
|
|
range_label->setVisible(can->isZoomed()); |
|
|
|
|
|
|
|
reset_zoom_btn->setEnabled(can->isZoomed()); |
|
|
|
if (can->isZoomed()) { |
|
|
|
if (can->isZoomed()) { |
|
|
|
auto [min, max] = can->range(); |
|
|
|
auto [min, max] = can->range(); |
|
|
|
range_label->setText(tr("%1 - %2").arg(min, 0, 'f', 2).arg(max, 0, 'f', 2)); |
|
|
|
range_label->setText(tr("%1 - %2").arg(min, 0, 'f', 2).arg(max, 0, 'f', 2)); |
|
|
|
range_label->setVisible(true); |
|
|
|
|
|
|
|
reset_zoom_btn->setEnabled(true); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
reset_zoom_btn->setEnabled(false); |
|
|
|
|
|
|
|
range_label->setVisible(false); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
title_label->setText(tr("Charts (%1)").arg(charts.size())); |
|
|
|
dock_btn->setText(docking ? "⬈" : "⬋"); |
|
|
|
dock_btn->setText(docking ? "⬈" : "⬋"); |
|
|
|
dock_btn->setToolTip(docking ? tr("Undock charts") : tr("Dock charts")); |
|
|
|
dock_btn->setToolTip(docking ? tr("Undock charts") : tr("Dock charts")); |
|
|
|
remove_all_btn->setVisible(!charts.empty()); |
|
|
|
|
|
|
|
reset_zoom_btn->setVisible(!charts.empty()); |
|
|
|
|
|
|
|
title_bar->setVisible(true); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartsWidget::addChart(const QString &id, const QString &sig_name) { |
|
|
|
void ChartsWidget::addChart(const QString &id, const Signal *sig) { |
|
|
|
const QString char_name = id + ":" + sig_name; |
|
|
|
if (!charts.contains(sig)) { |
|
|
|
if (charts.find(char_name) == charts.end()) { |
|
|
|
auto chart = new ChartWidget(id, sig, this); |
|
|
|
auto chart = new ChartWidget(id, sig_name, this); |
|
|
|
QObject::connect(chart, &ChartWidget::remove, [=]() { removeChart(sig); }); |
|
|
|
QObject::connect(chart, &ChartWidget::remove, [=]() { |
|
|
|
|
|
|
|
removeChart(id, sig_name); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
charts_layout->insertWidget(0, chart); |
|
|
|
charts_layout->insertWidget(0, chart); |
|
|
|
charts[char_name] = chart; |
|
|
|
charts.insert(sig, chart); |
|
|
|
} |
|
|
|
} |
|
|
|
updateTitleBar(); |
|
|
|
updateTitleBar(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartsWidget::removeChart(const QString &id, const QString &sig_name) { |
|
|
|
void ChartsWidget::removeChart(const Signal *sig) { |
|
|
|
if (auto it = charts.find(id + ":" + sig_name); it != charts.end()) { |
|
|
|
auto it = charts.find(sig); |
|
|
|
it->second->deleteLater(); |
|
|
|
if (it != charts.end()) { |
|
|
|
charts.erase(it); |
|
|
|
it.value()->deleteLater(); |
|
|
|
|
|
|
|
charts.remove(sig); |
|
|
|
} |
|
|
|
} |
|
|
|
updateTitleBar(); |
|
|
|
updateTitleBar(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartsWidget::removeAll() { |
|
|
|
void ChartsWidget::removeAll() { |
|
|
|
for (auto [_, chart] : charts) |
|
|
|
for (auto chart : charts) |
|
|
|
chart->deleteLater(); |
|
|
|
chart->deleteLater(); |
|
|
|
charts.clear(); |
|
|
|
charts.clear(); |
|
|
|
updateTitleBar(); |
|
|
|
updateTitleBar(); |
|
|
|
@ -134,19 +137,16 @@ bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) { |
|
|
|
|
|
|
|
|
|
|
|
// ChartWidget
|
|
|
|
// ChartWidget
|
|
|
|
|
|
|
|
|
|
|
|
ChartWidget::ChartWidget(const QString &id, const QString &sig_name, QWidget *parent) : id(id), sig_name(sig_name), QWidget(parent) { |
|
|
|
ChartWidget::ChartWidget(const QString &id, const Signal *sig, QWidget *parent) : id(id), signal(sig), QWidget(parent) { |
|
|
|
QVBoxLayout *main_layout = new QVBoxLayout(this); |
|
|
|
QVBoxLayout *main_layout = new QVBoxLayout(this); |
|
|
|
|
|
|
|
main_layout->setSpacing(0); |
|
|
|
QWidget *chart_widget = new QWidget(this); |
|
|
|
main_layout->setContentsMargins(0, 0, 0, 0); |
|
|
|
QVBoxLayout *chart_layout = new QVBoxLayout(chart_widget); |
|
|
|
|
|
|
|
chart_layout->setSpacing(0); |
|
|
|
|
|
|
|
chart_layout->setContentsMargins(0, 0, 0, 0); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QWidget *header = new QWidget(this); |
|
|
|
QWidget *header = new QWidget(this); |
|
|
|
header->setStyleSheet("background-color:white"); |
|
|
|
header->setStyleSheet("background-color:white"); |
|
|
|
QHBoxLayout *header_layout = new QHBoxLayout(header); |
|
|
|
QHBoxLayout *header_layout = new QHBoxLayout(header); |
|
|
|
header_layout->setContentsMargins(11, 11, 11, 0); |
|
|
|
header_layout->setContentsMargins(11, 11, 11, 0); |
|
|
|
QLabel *title = new QLabel(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); |
|
|
|
title = new QLabel(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); |
|
|
|
header_layout->addWidget(title); |
|
|
|
header_layout->addWidget(title); |
|
|
|
header_layout->addStretch(); |
|
|
|
header_layout->addStretch(); |
|
|
|
|
|
|
|
|
|
|
|
@ -155,26 +155,28 @@ ChartWidget::ChartWidget(const QString &id, const QString &sig_name, QWidget *pa |
|
|
|
remove_btn->setToolTip(tr("Remove chart")); |
|
|
|
remove_btn->setToolTip(tr("Remove chart")); |
|
|
|
QObject::connect(remove_btn, &QPushButton::clicked, this, &ChartWidget::remove); |
|
|
|
QObject::connect(remove_btn, &QPushButton::clicked, this, &ChartWidget::remove); |
|
|
|
header_layout->addWidget(remove_btn); |
|
|
|
header_layout->addWidget(remove_btn); |
|
|
|
chart_layout->addWidget(header); |
|
|
|
main_layout->addWidget(header); |
|
|
|
|
|
|
|
|
|
|
|
chart_view = new ChartView(id, sig_name, this); |
|
|
|
chart_view = new ChartView(id, sig, this); |
|
|
|
chart_view->setFixedHeight(300); |
|
|
|
chart_view->setFixedHeight(settings.chart_height); |
|
|
|
chart_layout->addWidget(chart_view); |
|
|
|
main_layout->addWidget(chart_view); |
|
|
|
chart_layout->addStretch(); |
|
|
|
main_layout->addStretch(); |
|
|
|
|
|
|
|
|
|
|
|
main_layout->addWidget(chart_widget); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
|
|
|
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ChartWidget::updateTitle() { |
|
|
|
|
|
|
|
title->setText(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// ChartView
|
|
|
|
// ChartView
|
|
|
|
|
|
|
|
|
|
|
|
ChartView::ChartView(const QString &id, const QString &sig_name, QWidget *parent) |
|
|
|
ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) |
|
|
|
: id(id), sig_name(sig_name), QChartView(nullptr, parent) { |
|
|
|
: id(id), signal(sig), QChartView(nullptr, parent) { |
|
|
|
QLineSeries *series = new QLineSeries(); |
|
|
|
QLineSeries *series = new QLineSeries(); |
|
|
|
series->setUseOpenGL(true); |
|
|
|
series->setUseOpenGL(true); |
|
|
|
QChart *chart = new QChart(); |
|
|
|
QChart *chart = new QChart(); |
|
|
|
chart->setTitle(sig_name); |
|
|
|
chart->setTitle(sig->name.c_str()); |
|
|
|
chart->addSeries(series); |
|
|
|
chart->addSeries(series); |
|
|
|
chart->createDefaultAxes(); |
|
|
|
chart->createDefaultAxes(); |
|
|
|
chart->legend()->hide(); |
|
|
|
chart->legend()->hide(); |
|
|
|
@ -201,17 +203,36 @@ ChartView::ChartView(const QString &id, const QString &sig_name, QWidget *parent |
|
|
|
rubber->setPalette(pal); |
|
|
|
rubber->setPalette(pal); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QTimer *timer = new QTimer(this); |
|
|
|
|
|
|
|
timer->setInterval(100); |
|
|
|
|
|
|
|
timer->setSingleShot(true); |
|
|
|
|
|
|
|
timer->callOnTimeout(this, &ChartView::adjustChartMargins); |
|
|
|
|
|
|
|
|
|
|
|
QObject::connect(can, &CANMessages::updated, this, &ChartView::updateState); |
|
|
|
QObject::connect(can, &CANMessages::updated, this, &ChartView::updateState); |
|
|
|
QObject::connect(can, &CANMessages::rangeChanged, this, &ChartView::rangeChanged); |
|
|
|
QObject::connect(can, &CANMessages::rangeChanged, this, &ChartView::rangeChanged); |
|
|
|
QObject::connect(can, &CANMessages::eventsMerged, this, &ChartView::updateSeries); |
|
|
|
QObject::connect(can, &CANMessages::eventsMerged, this, &ChartView::updateSeries); |
|
|
|
QObject::connect(dynamic_cast<QValueAxis *>(chart->axisX()), &QValueAxis::rangeChanged, can, &CANMessages::setRange); |
|
|
|
QObject::connect(dynamic_cast<QValueAxis *>(chart->axisX()), &QValueAxis::rangeChanged, can, &CANMessages::setRange); |
|
|
|
QObject::connect(dbc(), &DBCManager::signalUpdated, [this](const QString &msg_id, const QString &sig_name) { |
|
|
|
QObject::connect(chart, &QChart::plotAreaChanged, [=](const QRectF &plotArea) { |
|
|
|
if (this->id == msg_id && this->sig_name == sig_name) |
|
|
|
// use a singleshot timer to avoid recursion call.
|
|
|
|
updateSeries(); |
|
|
|
timer->start(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
updateSeries(); |
|
|
|
updateSeries(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ChartView::adjustChartMargins() { |
|
|
|
|
|
|
|
// TODO: Remove hardcoded aligned_pos
|
|
|
|
|
|
|
|
const int aligned_pos = 60; |
|
|
|
|
|
|
|
if (chart()->plotArea().left() != aligned_pos) { |
|
|
|
|
|
|
|
const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left(); |
|
|
|
|
|
|
|
chart()->setMargins(QMargins(left_margin, 0, 0, 0)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void ChartWidget::setHeight(int height) { |
|
|
|
|
|
|
|
chart_view->setFixedHeight(height); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartView::updateState() { |
|
|
|
void ChartView::updateState() { |
|
|
|
auto axis_x = dynamic_cast<QValueAxis *>(chart()->axisX()); |
|
|
|
auto axis_x = dynamic_cast<QValueAxis *>(chart()->axisX()); |
|
|
|
int x = chart()->plotArea().left() + chart()->plotArea().width() * (can->currentSec() - axis_x->min()) / (axis_x->max() - axis_x->min()); |
|
|
|
int x = chart()->plotArea().left() + chart()->plotArea().width() * (can->currentSec() - axis_x->min()) / (axis_x->max() - axis_x->min()); |
|
|
|
@ -219,9 +240,9 @@ void ChartView::updateState() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ChartView::updateSeries() { |
|
|
|
void ChartView::updateSeries() { |
|
|
|
const Signal *sig = dbc()->signal(id, sig_name); |
|
|
|
chart()->setTitle(signal->name.c_str()); |
|
|
|
auto events = can->events(); |
|
|
|
auto events = can->events(); |
|
|
|
if (!sig || !events) return; |
|
|
|
if (!events) return; |
|
|
|
|
|
|
|
|
|
|
|
auto l = id.split(':'); |
|
|
|
auto l = id.split(':'); |
|
|
|
int bus = l[0].toInt(); |
|
|
|
int bus = l[0].toInt(); |
|
|
|
@ -235,7 +256,7 @@ void ChartView::updateSeries() { |
|
|
|
for (auto c : evt->event.getCan()) { |
|
|
|
for (auto c : evt->event.getCan()) { |
|
|
|
if (bus == c.getSrc() && address == c.getAddress()) { |
|
|
|
if (bus == c.getSrc() && address == c.getAddress()) { |
|
|
|
auto dat = c.getDat(); |
|
|
|
auto dat = c.getDat(); |
|
|
|
double value = get_raw_value((uint8_t *)dat.begin(), dat.size(), *sig); |
|
|
|
double value = get_raw_value((uint8_t *)dat.begin(), dat.size(), *signal); |
|
|
|
double ts = (evt->mono_time / (double)1e9) - route_start_time; // seconds
|
|
|
|
double ts = (evt->mono_time / (double)1e9) - route_start_time; // seconds
|
|
|
|
vals.push_back({ts, value}); |
|
|
|
vals.push_back({ts, value}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
Jason Wen
3 years ago