X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewport.cpp;h=8963e047b355dc8f3f0d2d2eba30fd2cb3b92766;hb=14009012e02866aa8e8d338026901d180d00fcc6;hp=9f60c1a82ad123897d93b4a6b3360045ffa074ea;hpb=4b4f1c0dc17b481b798e60bbc3fa639c09a9c788;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 9f60c1a8..8963e047 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -19,6 +19,8 @@
  */
 
 #include <cassert>
+#include <cmath>
+#include <algorithm>
 
 #include "view.h"
 #include "viewport.h"
@@ -28,9 +30,11 @@
 
 #include <QMouseEvent>
 
+using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
+using std::stable_sort;
 using std::vector;
 
 namespace pv {
@@ -38,7 +42,7 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
 	QWidget(&parent),
-        _view(parent),
+	_view(parent),
 	_mouse_down_valid(false),
 	_pinch_zoom_active(false)
 {
@@ -48,32 +52,33 @@ Viewport::Viewport(View &parent) :
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
 
-	connect(&_view.session(), SIGNAL(signals_changed()),
-		this, SLOT(on_signals_changed()));
-
 	connect(&_view, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
-
-	// Trigger the initial event manually. The default device has signals
-	// which were created before this object came into being
-	on_signals_changed();
 }
 
 int Viewport::get_total_height() const
 {
 	int h = 0;
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	for (const shared_ptr<Trace> t : traces) {
-		assert(t);
-		h = max(t->get_v_offset() + View::SignalHeight, h);
-	}
-
+	for (auto &i : _view)
+		h = max(i->v_offset() + View::SignalHeight, h);
 	return h;
 }
 
+void Viewport::signals_updated()
+{
+	for (shared_ptr<RowItem> r : _view) {
+		assert(r);
+		connect(r.get(), SIGNAL(appearance_changed()),
+			this, SLOT(update()));
+	}
+}
+
 void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	vector< shared_ptr<RowItem> > row_items(_view.begin(), _view.end());
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->v_offset() < b->v_offset(); });
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
@@ -82,17 +87,17 @@ void Viewport::paintEvent(QPaintEvent*)
 		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	for (const shared_ptr<Trace> t : traces)
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(t);
-		t->paint_back(p, 0, width());
+		assert(r);
+		r->paint_back(p, 0, width());
 	}
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_mid(p, 0, width());
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_mid(p, 0, width());
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_fore(p, 0, width());
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_fore(p, 0, width());
 
 	if (_view.cursors_shown())
 		_view.cursors().draw_viewport_foreground(p, rect());
@@ -102,7 +107,7 @@ void Viewport::paintEvent(QPaintEvent*)
 
 bool Viewport::event(QEvent *event)
 {
-	switch(event->type()) {
+	switch (event->type()) {
 	case QEvent::TouchBegin:
 	case QEvent::TouchUpdate:
 	case QEvent::TouchEnd:
@@ -121,8 +126,7 @@ void Viewport::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if (event->button() == Qt::LeftButton)
-	{
+	if (event->button() == Qt::LeftButton) {
 		_mouse_down_point = event->pos();
 		_mouse_down_offset = _view.offset();
 		_mouse_down_valid = true;
@@ -134,18 +138,15 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
 	assert(event);
 
 	if (event->button() == Qt::LeftButton)
-	{
 		_mouse_down_valid = false;
-	}
 }
 
 void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if (event->buttons() & Qt::LeftButton)
-	{
-		if (! _mouse_down_valid) {
+	if (event->buttons() & Qt::LeftButton) {
+		if (!_mouse_down_valid) {
 			_mouse_down_point = event->pos();
 			_mouse_down_offset = _view.offset();
 			_mouse_down_valid = true;
@@ -230,16 +231,6 @@ bool Viewport::touchEvent(QTouchEvent *event)
 	return true;
 }
 
-void Viewport::on_signals_changed()
-{
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	for (shared_ptr<Trace> t : traces) {
-		assert(t);
-		connect(t.get(), SIGNAL(visibility_changed()),
-			this, SLOT(update()));
-	}
-}
-
 void Viewport::on_signals_moved()
 {
 	update();