DeviceManager: Use boost::algorithm::string::join to do concatenation

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

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 2ad8eef6b50f818478dfdec875be9031676c7145..ecce13893def06fb3e4c3f8559d412ef8d2fa5cc 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -101,11 +101,14 @@ QRectF CursorPair::label_rect(const QRectF &rect) const
                right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect)
 {
        assert(first_);
        assert(second_);
 
+       if (!enabled())
+               return;
+
        const unsigned int prefix = view_.tick_prefix();
 
        compute_text_size(p, prefix);
@@ -137,10 +140,6 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
                p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
                        pv::util::format_time(second_->time() - first_->time(), prefix, 2));
        }
-
-       // Paint the cursor markers
-       first_->paint_label(p, rect);
-       second_->paint_label(p, rect);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,