TimeMarker: Renamed get_label_rect, and made it take a const QRectF&

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

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 12b7bc341160b90f391b2c8d3df3056e3696a67f..8a0ecbf20b14c618ed587645f90b91a24cd69805 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -38,12 +38,17 @@ namespace view {
 const int CursorPair::DeltaPadding = 8;
 
 CursorPair::CursorPair(View &view) :
+       TimeItem(view),
        first_(new Cursor(view, 0.0)),
-       second_(new Cursor(view, 1.0)),
-       view_(view)
+       second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+       return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
        return first_;
@@ -54,7 +59,18 @@ shared_ptr<Cursor> CursorPair::second() const
        return second_;
 }
 
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+QPoint CursorPair::point() const
+{
+       return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+       (void)parent;
+       return nullptr;
+}
+
+QRectF CursorPair::label_rect(const QRectF &rect) const
 {
        const QSizeF label_size(
                text_size_.width() + View::LabelPadding.width() * 2,
@@ -82,7 +98,7 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
        const unsigned int prefix = view_.tick_prefix();
 
        compute_text_size(p, prefix);
-       QRectF delta_rect(get_label_rect(rect));
+       QRectF delta_rect(label_rect(rect));
 
        const int radius = delta_rect.height() / 2;
        const QRectF text_rect(delta_rect.intersected(