TimeMarker: Fixed position of set_time function

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index d1c16ba8a9339f665fe0064e09cd80c1dc293567..8eed6e7e2b6240c91c9cef368e3873df100b392b 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -43,7 +43,7 @@ const int TimeMarker::ArrowSize = 4;
 const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-       view_(view),
+       TimeItem(view),
        colour_(colour),
        time_(time),
        value_action_(NULL),
@@ -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,14 +70,17 @@ 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();
 }
 
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QPoint TimeMarker::point() const
+{
+       return QPoint(get_x(), 0);
+}
+
+QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
        const float x = (time_ - view_.offset()) / view_.scale();
 
@@ -113,7 +106,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
                return;
 
        const qreal x = (time_ - view_.offset()) / view_.scale();
-       const QRectF r(get_label_rect(rect));
+       const QRectF r(label_rect(rect));
 
        const QPointF points[] = {
                r.topLeft(),
@@ -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;