RowItem: Combined appearance change signals into appearance_changed()

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 43da472890120e4eb01acfb59fdd14db0d716cc0..221714051504a81a7e48b47056217d98f67e05cb 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -57,27 +57,19 @@ Viewport::Viewport(View &parent) :
 
        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) {
-               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*)
 {
-       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(); });
@@ -235,10 +227,9 @@ 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()),
+               connect(r.get(), SIGNAL(appearance_changed()),
                        this, SLOT(update()));
        }
 }