X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=eaa03b942294e62c4500f7b59bdbccb1a4b3ef8d;hp=4874eb233c7ebf7d9fe5e282883dc93a1efbc8a7;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hpb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416 diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index 4874eb23..eaa03b94 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -18,6 +18,7 @@ */ #include +#include #include @@ -73,7 +74,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time) float TimeMarker::get_x() const { - return ((time_ - view_.offset()) / view_.scale()).convert_to(); + return std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to()) + 0.5f; } QPoint TimeMarker::point(const QRect &rect) const @@ -107,7 +108,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover) if (!enabled()) return; - const qreal x = ((time_ - view_.offset()) / view_.scale()).convert_to(); + const qreal x = get_x(); const QRectF r(label_rect(rect)); const QPointF points[] = { @@ -153,7 +154,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover) p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text()); } -void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp) +void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp) { if (!enabled()) return;