View: Create trace groups from channel groups

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 2ab8ed986568ba4bfeaa36043840b723541ce867..c94e2d613d2ef7c25f9b5319a93d133c9e30f866 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -84,15 +84,6 @@ void Header::clear_selection()
        update();
 }
 
-void Header::signals_updated()
-{
-       for (shared_ptr<RowItem> r : _view) {
-               assert(r);
-               connect(r.get(), SIGNAL(appearance_changed()),
-                       this, SLOT(on_trace_changed()));
-       }
-}
-
 void Header::show_popup(const shared_ptr<RowItem> &item)
 {
        using pv::widgets::Popup;
@@ -101,7 +92,7 @@ void Header::show_popup(const shared_ptr<RowItem> &item)
        if (!p)
                return;
 
-       const QPoint pt(width() - BaselineOffset, item->get_y());
+       const QPoint pt(width() - BaselineOffset, item->get_visual_y());
        p->set_position(mapToGlobal(pt), Popup::Right);
        p->show();
 }
@@ -118,7 +109,7 @@ void Header::paintEvent(QPaintEvent*)
 
        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(); });
+                       return a->visual_v_offset() < b->visual_v_offset(); });
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
@@ -191,7 +182,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
                r->drag_release();
 
        if (_dragging)
-               _view.normalize_layout();
+               _view.restack_all_row_items();
        else
        {
                if (!ctrl_pressed) {
@@ -248,12 +239,15 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
        for (std::shared_ptr<RowItem> r : _view)
                if (r->dragging()) {
-                       r->set_v_offset(r->drag_point().y() + delta);
+                       r->force_to_v_offset(r->drag_point().y() + delta);
 
                        // Ensure the trace is selected
                        r->select();
                }
 
+       item_owner->restack_items();
+       for (const auto &r : *item_owner)
+               r->animate_to_layout_v_offset();
        signals_moved();
 
        update();
@@ -299,11 +293,5 @@ void Header::on_signals_moved()
        update();
 }
 
-void Header::on_trace_changed()
-{
-       update();
-       geometry_updated();
-}
-
 } // namespace view
 } // namespace pv