Some smaller whitespace fixes.

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 7d844d27bccadd71a287f5aeb784f9d5f1ad5f85..6ce52abc28c4a362cf798fac507e4187c311cef7 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -41,24 +41,28 @@ 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)
 {
-       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);
@@ -94,7 +98,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 +
@@ -116,7 +120,7 @@ void Viewport::wheelEvent(QWheelEvent *event)
 
 void Viewport::draw_cursors_background(QPainter &p)
 {
-       if(!_view.cursors_shown())
+       if (!_view.cursors_shown())
                return;
 
        p.setPen(Qt::NoPen);
@@ -133,7 +137,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();
@@ -142,5 +146,10 @@ void Viewport::draw_cursors_foreground(QPainter &p)
        cursors.second.paint(p, r);
 }
 
+void Viewport::on_signals_moved()
+{
+       update();
+}
+
 } // namespace view
 } // namespace pv