Moved viewport cursor draw functions into CursorsPair

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 7fe90c7b6ef11ccb12d3a91d8a3bb05c53334ee9..a677c50347a75ed4c57ff2d5bfcb891314be7ed5 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -22,6 +22,10 @@
 
 #include "view.h"
 
+#include <algorithm>
+
+using namespace std;
+
 namespace pv {
 namespace view {
 
@@ -52,5 +56,26 @@ Cursor& CursorPair::second()
        return _second;
 }
 
+void CursorPair::draw_viewport_background(QPainter &p,
+       const QRect &rect)
+{
+       p.setPen(Qt::NoPen);
+       p.setBrush(QBrush(View::CursorAreaColour));
+
+       const float x1 = (_first.time() - _view.offset()) / _view.scale();
+       const float x2 = (_second.time() - _view.offset()) / _view.scale();
+       const int l = (int)max(min(x1, x2), 0.0f);
+       const int r = (int)min(max(x1, x2), (float)rect.width());
+
+       p.drawRect(l, 0, r - l, rect.height());
+}
+
+void CursorPair::draw_viewport_foreground(QPainter &p,
+       const QRect &rect)
+{
+       _first.paint(p, rect);
+       _second.paint(p, rect);
+}
+
 } // namespace view
 } // namespace pv

diff --git a/pv/view/cursorpair.h b/pv/view/cursorpair.h
index 8c721bb63407a648044538627211160491bd7f3b..2bf85d835b775bc7b20245ce981401b4002575df 100644 (file)
--- a/pv/view/cursorpair.h
+++ b/pv/view/cursorpair.h
@@ -23,6 +23,8 @@
 
 #include "cursor.h"
 
+#include <QPainter>
+
 class QPainter;
 
 namespace pv {
@@ -57,6 +59,11 @@ public:
         */
        const Cursor& second() const;
 
+public:
+       void draw_viewport_background(QPainter &p, const QRect &rect);
+
+       void draw_viewport_foreground(QPainter &p, const QRect &rect);
+
 private:
        Cursor _first, _second;
        const View &_view;

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 70282d41c4acfbd1cbe759411a716de241079aee..7f2cedea0ccde0a1975c5a202e82a46fd62400b2 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -67,7 +67,8 @@ void Viewport::paintEvent(QPaintEvent*)
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
-       draw_cursors_background(p);
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
        const int v_offset = _view.v_offset();
@@ -78,7 +79,8 @@ void Viewport::paintEvent(QPaintEvent*)
                        _view.scale(), _view.offset());
        }
 
-       draw_cursors_foreground(p);
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_foreground(p, rect());
 
        p.end();
 }
@@ -119,34 +121,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
        }
 }
 
-void Viewport::draw_cursors_background(QPainter &p)
-{
-       if (!_view.cursors_shown())
-               return;
-
-       p.setPen(Qt::NoPen);
-       p.setBrush(QBrush(View::CursorAreaColour));
-
-       const CursorPair &c = _view.cursors();
-       const float x1 = (c.first().time() - _view.offset()) / _view.scale();
-       const float x2 = (c.second().time() - _view.offset()) / _view.scale();
-       const int l = (int)max(min(x1, x2), 0.0f);
-       const int r = (int)min(max(x1, x2), (float)width());
-
-       p.drawRect(l, 0, r - l, height());
-}
-
-void Viewport::draw_cursors_foreground(QPainter &p)
-{
-       if (!_view.cursors_shown())
-               return;
-
-       const QRect r = rect();
-       CursorPair &cursors = _view.cursors();
-       cursors.first().paint(p, r);
-       cursors.second().paint(p, r);
-}
-
 void Viewport::on_signals_moved()
 {
        update();

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index f72eee01e5e59f157739e67189ee9d8c52fbf41d..c15ef0a4d07ce30b894d49d0d1611be64eaa8872 100644 (file)
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -50,11 +50,6 @@ private:
        void mouseMoveEvent(QMouseEvent *event);
        void wheelEvent(QWheelEvent *event);
 
-private:
-       void draw_cursors_background(QPainter &p);
-
-       void draw_cursors_foreground(QPainter &p);
-
 private slots:
        void on_signals_moved();