X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=ffdf79a6cce9f29e8bf6d105d65a399a6dd3e124;hb=3e769a374963f37f7d52b65ef6c56bcdf1ef11fe;hp=514a3e49694e348dc08123749da90ff0290d1f67;hpb=4f82e4f613aced3594f07fa219a9d8c247eaed11;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 514a3e4..ffdf79a 100644 --- 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 r : _view) { - assert(r); - connect(r.get(), SIGNAL(appearance_changed()), - this, SLOT(on_trace_changed())); - } -} - void Header::show_popup(const shared_ptr &item) { using pv::widgets::Popup; @@ -101,7 +92,7 @@ void Header::show_popup(const shared_ptr &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 &a, const shared_ptr &b) { - return a->v_offset() < b->v_offset(); }); + return a->visual_v_offset() < b->visual_v_offset(); }); QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); @@ -246,7 +237,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) for (std::shared_ptr 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(); @@ -297,11 +288,5 @@ void Header::on_signals_moved() update(); } -void Header::on_trace_changed() -{ - update(); - geometry_updated(); -} - } // namespace view } // namespace pv