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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7d3dc7f6..98b5c65d 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"
 
@@ -51,10 +52,14 @@ 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);
 
+const QSizeF View::LabelPadding(4, 0);
+
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
 	_session(session),
@@ -77,6 +82,14 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
 
+	connect(&_cursors.first, SIGNAL(time_changed()),
+		this, SLOT(marker_time_changed()));
+	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);
 
@@ -193,6 +206,16 @@ void View::update_scroll()
 		_viewport->get_total_height() - areaSize.height());
 }
 
+void View::reset_signal_layout()
+{
+	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 + 2 * SignalMargin;
+	}
+}
+
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
@@ -284,6 +307,21 @@ 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()
+{
+	_ruler->update();
+	_viewport->update();
+}
+
+void View::on_signals_moved()
+{
+	update_scroll();
+	signals_moved();
 }
 
 } // namespace view