Moved viewport cursor draw functions into CursorsPair

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 90f2b4b2a5a922d63a7931e47d9482c621f4d088..7f2cedea0ccde0a1975c5a202e82a46fd62400b2 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -59,7 +59,7 @@ int Viewport::get_total_height() const
        return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
        const vector< shared_ptr<Signal> > sigs(
                _view.session().get_signals());
@@ -67,21 +67,20 @@ void Viewport::paintEvent(QPaintEvent *event)
        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();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
        {
                assert(s);
-
-               const QRect signal_rect(0, s->get_v_offset() - v_offset,
-                       width(), View::SignalHeight);
-
-               s->paint(p, signal_rect, _view.scale(), _view.offset());
+               s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+                       _view.scale(), _view.offset());
        }
 
-       draw_cursors_foreground(p);
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_foreground(p, rect());
 
        p.end();
 }
@@ -107,11 +106,6 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-}
-
 void Viewport::wheelEvent(QWheelEvent *event)
 {
        assert(event);
@@ -127,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 pair<Cursor, Cursor> &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();
-       pair<Cursor, Cursor> &cursors = _view.cursors();
-       cursors.first.paint(p, r);
-       cursors.second.paint(p, r);
-}
-
 void Viewport::on_signals_moved()
 {
        update();