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 d837067f8a72585e240461a8864ff5d85642ee28..7f2cedea0ccde0a1975c5a202e82a46fd62400b2 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #include <QMouseEvent>
 
@@ -41,41 +41,47 @@ Viewport::Viewport(View &parent) :
        setMouseTracking(true);
        setAutoFillBackground(true);
        setBackgroundRole(QPalette::Base);
+
+       connect(&_view, SIGNAL(signals_moved()),
+               this, SLOT(on_signals_moved()));
 }
 
 int Viewport::get_total_height() const
 {
-       int height = 0;
-       BOOST_FOREACH(const shared_ptr<Signal> s,
-               _view.session().get_signals()) {
+       int h = 0;
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
                assert(s);
-               height += View::SignalHeight;
+               h = max(s->get_v_offset() + View::SignalHeight, h);
        }
 
-       return height;
+       return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
 
        QPainter p(this);
+       p.setRenderHint(QPainter::Antialiasing);
+
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       int offset = -_view.v_offset();
+       const int v_offset = _view.v_offset();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
        {
                assert(s);
-
-               const QRect signal_rect(0, offset,
-                       width(), View::SignalHeight);
-
-               s->paint(p, signal_rect, _view.scale(), _view.offset());
-
-               offset += View::SignalHeight;
+               s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+                       _view.scale(), _view.offset());
        }
 
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_foreground(p, rect());
+
        p.end();
 }
 
@@ -91,7 +97,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
 
-       if(event->buttons() & Qt::LeftButton)
+       if (event->buttons() & Qt::LeftButton)
        {
                _view.set_scale_offset(_view.scale(),
                        _mouse_down_offset +
@@ -100,15 +106,24 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
        assert(event);
+
+       if (event->orientation() == Qt::Vertical) {
+               // Vertical scrolling is interpreted as zooming in/out
+               _view.zoom(event->delta() / 120, event->x());
+       } else if (event->orientation() == Qt::Horizontal) {
+               // Horizontal scrolling is interpreted as moving left/right
+               _view.set_scale_offset(_view.scale(),
+                                      event->delta() * _view.scale()
+                                      + _view.offset());
+       }
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::on_signals_moved()
 {
-       assert(event);
-       _view.zoom(event->delta() / 120, event->x());
+       update();
 }
 
 } // namespace view