Added pv::view::MarginWidget as a common base class of Header and Ruler

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9e639383942ed1149702f9e369b16452a46eba1f..654e6f45caea7652ae3ff5246492606833d42e82 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -49,8 +49,7 @@ const int Ruler::FirstSIPrefixPower = -15;
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-       QWidget(&parent),
-       _view(parent),
+       MarginWidget(parent),
        _grabbed_marker(NULL)
 {
        setMouseTracking(true);
@@ -163,7 +162,8 @@ void Ruler::paintEvent(QPaintEvent*)
        } while (x < width());
 
        // Draw the cursors
-       draw_cursors(p, prefix);
+       if (_view.cursors_shown())
+               _view.cursors().draw_markers(p, rect(), prefix);
 
        // Draw the hover mark
        draw_hover_mark(p);
@@ -186,14 +186,13 @@ void Ruler::mousePressEvent(QMouseEvent *e)
                _grabbed_marker = NULL;
 
                if (_view.cursors_shown()) {
-                       std::pair<Cursor, Cursor> &cursors =
-                               _view.cursors();
-                       if (cursors.first.get_label_rect(
+                       CursorPair &cursors = _view.cursors();
+                       if (cursors.first().get_label_rect(
                                rect()).contains(e->pos()))
-                               _grabbed_marker = &cursors.first;
-                       else if (cursors.second.get_label_rect(
+                               _grabbed_marker = &cursors.first();
+                       else if (cursors.second().get_label_rect(
                                rect()).contains(e->pos()))
-                               _grabbed_marker = &cursors.second;
+                               _grabbed_marker = &cursors.second();
                }
        }
 }
@@ -203,17 +202,6 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
        _grabbed_marker = NULL;
 }
 
-void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
-{
-       if (!_view.cursors_shown())
-               return;
-
-       const QRect r = rect();
-       pair<Cursor, Cursor> &cursors = _view.cursors();
-       cursors.first.paint_label(p, r, prefix);
-       cursors.second.paint_label(p, r, prefix);
-}
-
 void Ruler::draw_hover_mark(QPainter &p)
 {
        const int x = _view.hover_point().x();