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

cabana: set series color in createSeries (#27270)

Browse Source 
* set color in createSeries

* fix
old-commit-hash: 37abe3711788d87255b6b1719ea2dc30f0b57522
This commit is contained in:
Dean Lee
2023-02-10 02:37:37 +08:00
committed by GitHub
parent 542e915982
commit cff6df8b8c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cabana/chartswidget.cc
+5 -4
View File
@@ -365,7 +365,7 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
}
void ChartView::addSeries(const QString &msg_id, const Signal *sig) {
QXYSeries *series = createSeries(series_type);
QXYSeries *series = createSeries(series_type, getColor(sig));
chart()->addSeries(series);
series->attachAxis(axis_x);
series->attachAxis(axis_y);
@@ -519,8 +519,8 @@ void ChartView::updateSeries(const Signal *sig, const std::vector<Event *> *even
s.vals.clear();
s.vals.reserve(settings.max_cached_minutes * 60 * 100); // [n]seconds * 100hz
s.last_value_mono_time = 0;
s.series->setColor(getColor(s.sig));
}
s.series->setColor(getColor(s.sig));
struct Chunk {
std::vector<Event *>::const_iterator first, second;
@@ -777,13 +777,14 @@ void ChartView::drawForeground(QPainter *painter, const QRectF &rect) {
}
}
QXYSeries *ChartView::createSeries(QAbstractSeries::SeriesType type) {
QXYSeries *ChartView::createSeries(QAbstractSeries::SeriesType type, QColor color) {
QXYSeries *series = nullptr;
if (type == QAbstractSeries::SeriesTypeLine) {
series = new QLineSeries(this);
} else {
series = new QScatterSeries(this);
}
series->setColor(color);
// TODO: Due to a bug in CameraWidget the camera frames
// are drawn instead of the graphs on MacOS. Re-enable OpenGL when fixed
#ifndef __APPLE__
@@ -802,7 +803,7 @@ void ChartView::setSeriesType(QAbstractSeries::SeriesType type) {
s.series->deleteLater();
}
for (auto &s : sigs) {
auto series = createSeries(series_type);
auto series = createSeries(series_type, getColor(s.sig));
chart()->addSeries(series);
series->attachAxis(axis_x);
series->attachAxis(axis_y);
tools/cabana/chartswidget.h
+1 -1
View File
@@ -76,7 +76,7 @@ private:
void drawForeground(QPainter *painter, const QRectF &rect) override;
std::tuple<double, double, int> getNiceAxisNumbers(qreal min, qreal max, int tick_count);
qreal niceNumber(qreal x, bool ceiling);
QXYSeries *createSeries(QAbstractSeries::SeriesType type);
QXYSeries *createSeries(QAbstractSeries::SeriesType type, QColor color);
void updateSeriesPoints();
int y_label_width = 0;