CursorPair: Paint with ViewItem::paint_fore/paint_back

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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 7e23806896d5ed010d090412b03cd9fc877daac8..ad3830590a8b059a1d3006275c3e812f0dff2e8e 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),
@@ -80,35 +80,33 @@ void TimeMarker::set_time(double time)
        time_changed();
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
-{
-       const float x = get_x();
-       p.setPen(colour_.darker());
-       p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
-}
-
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
        const float x = (time_ - view_.offset()) / view_.scale();
 
        QFontMetrics m(QApplication::font());
-       QSize text_size = m.boundingRect(get_text()).size();
+       const float text_width =
+               max(m.boundingRect(get_text()).size().width(), ArrowSize);
+       const float text_height = m.boundingRect("Tg").size().height();
 
        const QSizeF label_size(
-               text_size.width() + View::LabelPadding.width() * 2,
-               text_size.height() + View::LabelPadding.height() * 2);
+               text_width + View::LabelPadding.width() * 2,
+               text_height + View::LabelPadding.height() * 2);
        const float top = rect.height() - label_size.height() -
                TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
        const float height = label_size.height();
 
-       return QRectF(x - label_size.width() / 2 - 0.5f, top,
+       return QRectF(x - label_size.width() / 2, top,
                label_size.width(), height);
 }
 
 void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 {
+       if (!enabled())
+               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(),
@@ -153,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;