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: draw line marker in drawForegound (#26542)

Browse Source 
draw line marker in drawForegound
old-commit-hash: 9c815c2081fb61dfe84a79b617f17280c0396773
This commit is contained in:
Dean Lee
2022-11-19 02:25:11 +08:00
committed by GitHub
parent 40123aed4b
commit de99eb91c6
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cabana/chartswidget.cc
+8 -17
View File
@@ -102,7 +102,7 @@ void ChartsWidget::updateState() {
const auto &range = is_zoomed ? zoomed_range : display_range;
for (auto c : charts) {
c->setDisplayRange(range.first, range.second);
c->updateLineMarker(current_sec);
c->scene()->invalidate({}, QGraphicsScene::ForegroundLayer);
}
}
@@ -178,9 +178,6 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) {
// top margin for title
chart->setMargins({0, 11, 0, 0});
line_marker = new QGraphicsLineItem(chart);
line_marker->setZValue(chart->zValue() + 10);
track_line = new QGraphicsLineItem(chart);
track_line->setPen(QPen(Qt::darkGray, 1, Qt::DashLine));
track_ellipse = new QGraphicsEllipseItem(chart);
@@ -304,7 +301,6 @@ void ChartView::updateFromSettings() {
setFixedHeight(settings.chart_height);
chart()->setTheme(settings.chart_theme == 0 ? QChart::ChartThemeLight : QChart::QChart::ChartThemeDark);
auto color = chart()->titleBrush().color();
line_marker->setPen(QPen(color, 2));
}
void ChartView::setEventsRange(const std::pair<double, double> &range) {
@@ -327,15 +323,6 @@ void ChartView::adjustChartMargins() {
if (chart()->plotArea().left() != aligned_pos) {
const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left();
chart()->setMargins(QMargins(left_margin, 11, 0, 0));
updateLineMarker(can->currentSec());
}
}
void ChartView::updateLineMarker(double current_sec) {
int x = chart()->plotArea().left() +
chart()->plotArea().width() * (current_sec - axis_x->min()) / (axis_x->max() - axis_x->min());
if (int(line_marker->line().x1()) != x) {
line_marker->setLine(x, chart()->plotArea().top() - chart()->margins().top() + 3, x, height());
}
}
@@ -429,7 +416,6 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) {
// zoom in if selected range is greater than 0.5s
emit zoomIn(min, max);
}
viewport()->update();
event->accept();
} else if (event->button() == Qt::RightButton) {
emit zoomReset();
@@ -437,7 +423,6 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) {
} else {
QGraphicsView::mouseReleaseEvent(event);
}
setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
}
void ChartView::mouseMoveEvent(QMouseEvent *ev) {
@@ -477,7 +462,13 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) {
item_group->setVisible(!text_list.isEmpty());
} else {
item_group->setVisible(false);
setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
}
QChartView::mouseMoveEvent(ev);
}
void ChartView::drawForeground(QPainter *painter, const QRectF &rect) {
qreal x = chart()->plotArea().left() +
chart()->plotArea().width() * (can->currentSec() - axis_x->min()) / (axis_x->max() - axis_x->min());
painter->setPen(QPen(chart()->titleBrush().color(), 2));
painter->drawLine(QPointF{x, chart()->plotArea().top() - 2}, QPointF{x, chart()->plotArea().bottom() + 2});
}
tools/cabana/chartswidget.h
+2 -2
View File
@@ -28,7 +28,6 @@ public:
void updateSeries(const Signal *sig = nullptr);
void setEventsRange(const std::pair<double, double> &range);
void setDisplayRange(double min, double max);
void updateLineMarker(double current_sec);
struct SigItem {
QString msg_id;
@@ -63,11 +62,12 @@ private:
void updateAxisY();
void updateTitle();
void updateFromSettings();
void drawForeground(QPainter *painter, const QRectF &rect) override;
QValueAxis *axis_x;
QValueAxis *axis_y;
QGraphicsItemGroup *item_group;
QGraphicsLineItem *line_marker, *track_line;
QGraphicsLineItem *track_line;
QGraphicsEllipseItem *track_ellipse;
QGraphicsTextItem *value_text;
QGraphicsProxyWidget *close_btn_proxy;