X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=8eed6e7e2b6240c91c9cef368e3873df100b392b;hp=eebac024cca0c81608d5452a560544e235081813;hb=70a4886c67e381302d904d1d867abb9d8eac7053;hpb=689dea92f288564260ef521f6f499e03e3cdbbd2 diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index eebac024..8eed6e7e 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -57,16 +57,6 @@ double TimeMarker::time() const return time_; } -float TimeMarker::get_x() const -{ - return (time_ - view_.offset()) / view_.scale(); -} - -QPoint TimeMarker::point() const -{ - return QPoint(get_x(), 0); -} - void TimeMarker::set_time(double time) { time_ = time; @@ -80,11 +70,14 @@ void TimeMarker::set_time(double time) time_changed(); } -void TimeMarker::paint(QPainter &p, const QRect &rect) +float TimeMarker::get_x() const { - const float x = get_x(); - p.setPen(colour_.darker()); - p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom())); + return (time_ - view_.offset()) / view_.scale(); +} + +QPoint TimeMarker::point() const +{ + return QPoint(get_x(), 0); } QRectF TimeMarker::label_rect(const QRectF &rect) const @@ -158,6 +151,16 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect) p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text()); } +void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp) +{ + if (!enabled()) + return; + + const float x = get_x(); + p.setPen(colour_.darker()); + p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom())); +} + pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent) { using pv::widgets::Popup;