Use iterators to traverse signals

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index c987c3683164e598d9c1f94e8b0a88560ad33920..c0e9a69e3679f4796512160918b60136817c5ac7 100644 (file)
--- 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 {
@@ -64,18 +66,17 @@ Viewport::Viewport(View &parent) :
 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) {
-               assert(r);
-               h = max(r->v_offset() + View::SignalHeight, h);
-       }
-
+       for (auto &i : _view)
+               h = max(i->v_offset() + View::SignalHeight, h);
        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);
@@ -230,8 +231,7 @@ bool Viewport::touchEvent(QTouchEvent *event)
 
 void Viewport::on_signals_changed()
 {
-       const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-       for (shared_ptr<RowItem> r : row_items) {
+       for (shared_ptr<RowItem> r : _view) {
                assert(r);
                connect(r.get(), SIGNAL(visibility_changed()),
                        this, SLOT(update()));