View: Replaced signals_changed handler with signals_updated call

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 8377cb2cfc481e76d932b68c47e35cc14bd5edec..cda0848984a8cbf3d3ae144b5dc139703e929c5c 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -55,57 +55,42 @@ Header::Header(View &parent) :
        setFocusPolicy(Qt::ClickFocus);
        setMouseTracking(true);
 
-       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();
 }
 
 QSize Header::sizeHint() const
 {
-       int max_width = 0;
-
-       const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-       for (shared_ptr<RowItem> r : row_items) {
-               assert(r);
-
-               if (r->enabled()) {
-                       max_width = max(max_width, (int)r->label_rect(0).width());
-               }
-       }
-
-       return QSize(max_width + Padding + BaselineOffset, 0);
+       QRectF max_rect(-Padding, 0, Padding, 0);
+       for (auto &i : _view)
+               if (i->enabled())
+                       max_rect = max_rect.united(i->label_rect(0));
+       return QSize(max_rect.width() + Padding + BaselineOffset, 0);
 }
 
 shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
 {
        const int w = width() - BaselineOffset;
-       const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-
-       for (const shared_ptr<RowItem> r : row_items)
-       {
-               assert(r);
-               if (r->enabled() && r->label_rect(w).contains(pt))
-                       return r;
-       }
-
+       for (auto &i : _view)
+               if (i->enabled() && i->label_rect(w).contains(pt))
+                       return i;
        return shared_ptr<RowItem>();
 }
 
 void Header::clear_selection()
 {
-       const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-       for (const shared_ptr<RowItem> r : row_items) {
+       for (auto &i : _view)
+               i->select(false);
+       update();
+}
+
+void Header::signals_updated()
+{
+       for (shared_ptr<RowItem> r : _view) {
                assert(r);
-               r->select(false);
+               connect(r.get(), SIGNAL(appearance_changed()),
+                       this, SLOT(on_trace_changed()));
        }
-
-       update();
 }
 
 void Header::show_popup(const shared_ptr<RowItem> &item)
@@ -128,7 +113,9 @@ void Header::paintEvent(QPaintEvent*)
        // would be clipped away.
        const int w = width() - BaselineOffset;
 
-       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(); });
@@ -153,13 +140,11 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
 
-       const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-
        if (event->button() & Qt::LeftButton) {
                _mouse_down_point = event->pos();
 
                // Save the offsets of any signals which will be dragged
-               for (const shared_ptr<RowItem> r : row_items)
+               for (const shared_ptr<RowItem> r : _view)
                        if (r->selected())
                                _drag_row_items.push_back(
                                        make_pair(r, r->v_offset()));
@@ -189,7 +174,7 @@ void Header::mousePressEvent(QMouseEvent *event)
        if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
                // Unselect all other signals because the Ctrl is not
                // pressed
-               for (const shared_ptr<RowItem> r : row_items)
+               for (const shared_ptr<RowItem> r : _view)
                        if (r != mouse_over_row_item)
                                r->select(false);
        }
@@ -268,9 +253,14 @@ void Header::leaveEvent(QEvent*)
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
        const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+       if (!r)
+               return;
+
+       QMenu *const menu = r->create_context_menu(this);
+       if (!menu)
+               return;
 
-       if (r)
-               r->create_context_menu(this)->exec(event->globalPos());
+       menu->exec(event->globalPos());
 }
 
 void Header::keyPressEvent(QKeyEvent *e)
@@ -281,8 +271,7 @@ void Header::keyPressEvent(QKeyEvent *e)
        {
        case Qt::Key_Delete:
        {
-               const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-               for (const shared_ptr<RowItem> r : row_items)
+               for (const shared_ptr<RowItem> r : _view)
                        if (r->selected())
                                r->delete_pressed();
                break;
@@ -290,20 +279,6 @@ void Header::keyPressEvent(QKeyEvent *e)
        }
 }
 
-void Header::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(on_trace_changed()));
-               connect(r.get(), SIGNAL(text_changed()),
-                       this, SLOT(on_trace_changed()));
-               connect(r.get(), SIGNAL(colour_changed()),
-                       this, SLOT(update()));
-       }
-}
-
 void Header::on_signals_moved()
 {
        update();