Deleted unused pv::view::Viewport::mouseReleaseEvent handler

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 96111875570ee7e53bf0e9773285686acb01e8a8..ba26c3c1bcaf1743b0809c9d53c4b9fe44d6fbae 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,8 +49,9 @@ Viewport::Viewport(View &parent) :
 int Viewport::get_total_height() const
 {
        int h = 0;
-       BOOST_FOREACH(const shared_ptr<Signal> s,
-               _view.session().get_signals()) {
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
                assert(s);
                h = max(s->get_v_offset() + View::SignalHeight, h);
        }
@@ -58,10 +59,10 @@ 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();
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
 
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
@@ -73,11 +74,8 @@ void Viewport::paintEvent(QPaintEvent *event)
        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);
@@ -97,7 +95,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 +
@@ -106,20 +104,24 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-}
-
 void Viewport::wheelEvent(QWheelEvent *event)
 {
        assert(event);
-       _view.zoom(event->delta() / 120, event->x());
+
+       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::draw_cursors_background(QPainter &p)
 {
-       if(!_view.cursors_shown())
+       if (!_view.cursors_shown())
                return;
 
        p.setPen(Qt::NoPen);
@@ -136,7 +138,7 @@ void Viewport::draw_cursors_background(QPainter &p)
 
 void Viewport::draw_cursors_foreground(QPainter &p)
 {
-       if(!_view.cursors_shown())
+       if (!_view.cursors_shown())
                return;
 
        const QRect r = rect();