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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 9f60c1a8..43da4728 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)
 {
@@ -62,10 +66,10 @@ Viewport::Viewport(View &parent) :
 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);
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (const shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		h = max(r->v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -73,7 +77,10 @@ int Viewport::get_total_height() const
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	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 +89,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 +109,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 +128,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 +140,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;
@@ -232,10 +235,10 @@ bool Viewport::touchEvent(QTouchEvent *event)
 
 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()),
+	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()));
 	}
 }