Moved ruler cursor draw functions into CursorsPair

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index a677c50347a75ed4c57ff2d5bfcb891314be7ed5..c148b85139d55d052cf5c444af8a18f27cd002e7 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -56,6 +56,13 @@ Cursor& CursorPair::second()
        return _second;
 }
 
+void CursorPair::draw_markers(QPainter &p,
+       const QRect &rect, unsigned int prefix)
+{
+       _first.paint_label(p, rect, prefix);
+       _second.paint_label(p, rect, prefix);
+}
+
 void CursorPair::draw_viewport_background(QPainter &p,
        const QRect &rect)
 {

diff --git a/pv/view/cursorpair.h b/pv/view/cursorpair.h
index 2bf85d835b775bc7b20245ce981401b4002575df..05035cc26385560af3c80f8c8e2771e0f05a9f41 100644 (file)
--- a/pv/view/cursorpair.h
+++ b/pv/view/cursorpair.h
@@ -60,6 +60,9 @@ public:
        const Cursor& second() const;
 
 public:
+       void draw_markers(QPainter &p,
+               const QRect &rect, unsigned int prefix);
+
        void draw_viewport_background(QPainter &p, const QRect &rect);
 
        void draw_viewport_foreground(QPainter &p, const QRect &rect);

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 0322af8a611e1ad9520b854e2cbae0b7ec39ad81..d323f9be0525be8c5e39f3621d6c4ca9f05e0f5b 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -163,7 +163,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);
@@ -202,17 +203,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();
-       CursorPair &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();

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index f40f8255379166a06084c82c5c906783fb563346..689b073cede32e81af7e43e901057c2c93e515bf 100644 (file)
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -56,8 +56,6 @@ private:
        void mouseReleaseEvent(QMouseEvent *);
 
 private:
-       void draw_cursors(QPainter &p, unsigned int prefix);
-
        /**
         * Draw a hover arrow under the cursor position.
         */