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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index e36072ef..98b5c65d 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -52,7 +52,9 @@ const int View::RulerHeight = 30;
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
-const int View::SignalHeight = 50;
+const int View::SignalHeight = 30;
+const int View::SignalMargin = 10;
+const int View::SignalSnapGridSize = 10;
 
 const QColor View::CursorAreaColour(220, 231, 243);
 
@@ -85,6 +87,9 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(&_cursors.second, SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
 
+	connect(_header, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
+
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
 
@@ -203,11 +208,11 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-	int offset = 0;
+	int offset = SignalMargin;
 	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
 	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
 		s->set_v_offset(offset);
-		offset += SignalHeight;
+		offset += SignalHeight + 2 * SignalMargin;
 	}
 }
 
@@ -313,5 +318,11 @@ void View::marker_time_changed()
 	_viewport->update();
 }
 
+void View::on_signals_moved()
+{
+	update_scroll();
+	signals_moved();
+}
+
 } // namespace view
 } // namespace pv