X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=e0fce889fe06431c6122c4eaad1ec2a9938b6d39;hp=98b5c65dd1fc37f8b3084e5363bb936b4fc1611a;hb=3868e5fa3081573891ff2ae5b9dd67eb4a6afa4b;hpb=8d44d030c3923055f2ea81d5334d3a3bce7900c2

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 98b5c65d..e0fce889 100644
--- 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,6 +171,22 @@ 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();
@@ -203,17 +222,20 @@ 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)
@@ -288,6 +310,11 @@ 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
@@ -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()