Some smaller whitespace fixes.

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 98b5c65dd1fc37f8b3084e5363bb936b4fc1611a..8fca4be28b9af9cc059d6e4df04ad47ad853f17f 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -79,6 +79,9 @@ View::View(SigSession &session, QWidget *parent) :
                this, SLOT(h_scroll_value_changed(int)));
        connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(v_scroll_value_changed(int)));
+
+       connect(&_session, SIGNAL(signals_changed()),
+               this, SLOT(signals_changed()));
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
@@ -168,10 +171,26 @@ const QPoint& View::hover_point() const
        return _hover_point;
 }
 
+void View::normalize_layout()
+{
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+
+       int v_min = INT_MAX;
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+               v_min = min(s->get_v_offset(), v_min);
+
+       const int delta = -min(v_min, 0);
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs)
+               s->set_v_offset(s->get_v_offset() + delta);
+
+       verticalScrollBar()->setSliderPosition(_v_offset + delta);
+       v_scroll_value_changed(verticalScrollBar()->sliderPosition());
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
        const shared_ptr<SignalData> sig_data = _session.get_data();
-       if(!sig_data)
+       if (!sig_data)
                return;
 
        length = _data_length / (sig_data->get_samplerate() * _scale);
@@ -191,7 +210,7 @@ void View::update_scroll()
 
        horizontalScrollBar()->setPageStep(areaSize.width());
 
-       if(length < MaxScrollValue) {
+       if (length < MaxScrollValue) {
                horizontalScrollBar()->setRange(0, length);
                horizontalScrollBar()->setSliderPosition(offset);
        } else {
@@ -203,37 +222,40 @@ void View::update_scroll()
        // Set the vertical scrollbar
        verticalScrollBar()->setPageStep(areaSize.height());
        verticalScrollBar()->setRange(0,
-               _viewport->get_total_height() - areaSize.height());
+               _viewport->get_total_height() + SignalMargin -
+               areaSize.height());
 }
 
 void View::reset_signal_layout()
 {
        int offset = SignalMargin;
-       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
        BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
                s->set_v_offset(offset);
                offset += SignalHeight + 2 * SignalMargin;
        }
+
+       normalize_layout();
 }
 
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
-       if(type == QEvent::MouseMove) {
+       if (type == QEvent::MouseMove) {
 
                const QMouseEvent *const mouse_event = (QMouseEvent*)event;
-               if(object == _viewport)
+               if (object == _viewport)
                        _hover_point = mouse_event->pos();
-               else if(object == _ruler)
+               else if (object == _ruler)
                        _hover_point = QPoint(mouse_event->x(), 0);
-               else if(object == _header)
+               else if (object == _header)
                        _hover_point = QPoint(0, mouse_event->y());
                else
                        _hover_point = QPoint(-1, -1);
 
                hover_point_changed();
 
-       } else if(type == QEvent::Leave) {
+       } else if (type == QEvent::Leave) {
                _hover_point = QPoint(-1, -1);
                hover_point_changed();
        }
@@ -269,7 +291,7 @@ void View::resizeEvent(QResizeEvent *e)
 void View::h_scroll_value_changed(int value)
 {
        const int range = horizontalScrollBar()->maximum();
-       if(range < MaxScrollValue)
+       if (range < MaxScrollValue)
                _offset = _scale * value;
        else {
                double length = 0, offset;
@@ -288,16 +310,21 @@ void View::v_scroll_value_changed(int value)
        _viewport->update();
 }
 
+void View::signals_changed()
+{
+       reset_signal_layout();
+}
+
 void View::data_updated()
 {
        // Get the new data length
        _data_length = 0;
        shared_ptr<LogicData> sig_data = _session.get_data();
-       if(sig_data) {
+       if (sig_data) {
                deque< shared_ptr<LogicDataSnapshot> > &snapshots =
                        sig_data->get_snapshots();
                BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
-                       if(s)
+                       if (s)
                                _data_length = max(_data_length,
                                        s->get_sample_count());
        }
@@ -307,9 +334,6 @@ void View::data_updated()
 
        // Repaint the view
        _viewport->update();
-
-       /// @todo: Call this only once when the signals are first created.
-       reset_signal_layout();
 }
 
 void View::marker_time_changed()