Use iterators to traverse signals

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 361a60c138208911ce5bf044c685f8d0c4a3d52a..22bc528cb19e727851219d7d7a136a4bb300419d 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -24,7 +24,8 @@
 #include "signal.h"
 #include "../sigsession.h"
 
-#include <assert.h>
+#include <cassert>
+#include <algorithm>
 
 #include <QApplication>
 #include <QMenu>
@@ -38,6 +39,7 @@ using std::max;
 using std::make_pair;
 using std::pair;
 using std::shared_ptr;
+using std::stable_sort;
 using std::vector;
 
 namespace pv {
@@ -68,14 +70,9 @@ 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());
-               }
-       }
+       for (auto &i : _view)
+               if (i->enabled())
+                       max_width = max(max_width, (int)i->label_rect(0).width());
 
        return QSize(max_width + Padding + BaselineOffset, 0);
 }
@@ -83,36 +80,45 @@ QSize Header::sizeHint() const
 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) {
-               assert(r);
-               r->select(false);
-       }
-
+       for (auto &i : _view)
+               i->select(false);
        update();
 }
 
+void Header::show_popup(const shared_ptr<RowItem> &item)
+{
+       using pv::widgets::Popup;
+
+       Popup *const p = item->create_popup(&_view);
+       if (!p)
+               return;
+
+       const QPoint pt(width() - BaselineOffset, item->get_y());
+       p->set_position(mapToGlobal(pt), Popup::Right);
+       p->show();
+}
+
 void Header::paintEvent(QPaintEvent*)
 {
        // The trace labels are not drawn with the arrows exactly on the
        // left edge of the widget, because then the selection shadow
        // would be clipped away.
        const int w = width() - BaselineOffset;
-       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 painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
@@ -134,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()));
@@ -170,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);
        }
@@ -181,8 +185,6 @@ void Header::mousePressEvent(QMouseEvent *event)
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
-       using pv::widgets::Popup;
-
        assert(event);
        if (event->button() == Qt::LeftButton) {
                if (_dragging)
@@ -191,15 +193,8 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
                {
                        const shared_ptr<RowItem> mouse_over_row_item =
                                get_mouse_over_row_item(event->pos());
-                       if (mouse_over_row_item) {
-                               const int w = width() - BaselineOffset;
-                               Popup *const p =
-                                       mouse_over_row_item->create_popup(&_view);
-                               p->set_position(mapToGlobal(QPoint(w,
-                                       mouse_over_row_item->get_y())),
-                                       Popup::Right);
-                               p->show();
-                       }
+                       if (mouse_over_row_item)
+                               show_popup(mouse_over_row_item);
                }
 
                _dragging = false;
@@ -258,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)
@@ -271,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;
@@ -282,8 +281,7 @@ 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) {
+       for (shared_ptr<RowItem> r : _view) {
                assert(r);
                connect(r.get(), SIGNAL(visibility_changed()),
                        this, SLOT(on_trace_changed()));