X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=0a31e808f20d9e78603994584677631ff1b94c13;hp=d2f708e5e103d5642d1af1de46f9a30a3ce68073;hb=491536836d878a3abf7959800f56641ac093bd11;hpb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index d2f708e5..0a31e808 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -30,6 +30,7 @@
 
 #include "header.h"
 #include "ruler.h"
+#include "signal.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -52,9 +53,12 @@ const int View::RulerHeight = 30;
 const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 50;
+const int View::SignalSnapGridSize = 10;
 
 const QColor View::CursorAreaColour(220, 231, 243);
 
+const QSizeF View::LabelPadding(4, 0);
+
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
 	_session(session),
@@ -82,6 +86,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(signals_moved()));
+
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
 
@@ -198,6 +205,16 @@ void View::update_scroll()
 		_viewport->get_total_height() - areaSize.height());
 }
 
+void View::reset_signal_layout()
+{
+	int offset = 0;
+	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+		s->set_v_offset(offset);
+		offset += SignalHeight;
+	}
+}
+
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
@@ -289,6 +306,9 @@ 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()
@@ -297,5 +317,11 @@ void View::marker_time_changed()
 	_viewport->update();
 }
 
+void View::signals_moved()
+{
+	_header->update();
+	_viewport->update();
+}
+
 } // namespace view
 } // namespace pv