X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=8fca4be28b9af9cc059d6e4df04ad47ad853f17f;hp=d2f708e5e103d5642d1af1de46f9a30a3ce68073;hb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;hpb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index d2f708e5..8fca4be2 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),
@@ -74,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()));
 
@@ -82,6 +90,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);
 
@@ -160,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);
@@ -183,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 {
@@ -195,27 +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;
+	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();
 	}
@@ -251,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;
@@ -270,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());
 	}
@@ -297,5 +342,11 @@ void View::marker_time_changed()
 	_viewport->update();
 }
 
+void View::on_signals_moved()
+{
+	update_scroll();
+	signals_moved();
+}
+
 } // namespace view
 } // namespace pv