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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index c987c368..8963e047 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -20,6 +20,7 @@
 
 #include <cassert>
 #include <cmath>
+#include <algorithm>
 
 #include "view.h"
 #include "viewport.h"
@@ -33,6 +34,7 @@ using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
+using std::stable_sort;
 using std::vector;
 
 namespace pv {
@@ -50,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<RowItem> > row_items(_view.child_items());
-	for (const shared_ptr<RowItem> r : row_items) {
+	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);
-		h = max(r->v_offset() + View::SignalHeight, h);
+		connect(r.get(), SIGNAL(appearance_changed()),
+			this, SLOT(update()));
 	}
-
-	return h;
 }
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	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);
@@ -228,16 +231,6 @@ bool Viewport::touchEvent(QTouchEvent *event)
 	return true;
 }
 
-void Viewport::on_signals_changed()
-{
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-	for (shared_ptr<RowItem> r : row_items) {
-		assert(r);
-		connect(r.get(), SIGNAL(visibility_changed()),
-			this, SLOT(update()));
-	}
-}
-
 void Viewport::on_signals_moved()
 {
 	update();