X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=bfb75532aa58ad7508db13b1243ce051613e131c;hp=a42becaf366695caeff75440fd4ffff6e6eee18c;hb=adf3aaf490ad6f04f7a92a5bc01581f3075b1e9e;hpb=e47b69882ca7299041123c664dbcc8b552c5db99 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index a42becaf..bfb75532 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -54,7 +54,7 @@ namespace view { const int Header::Padding = 12; const int Header::BaselineOffset = 5; -static bool item_selected(shared_ptr r) +static bool item_selected(shared_ptr r) { return r->selected(); } @@ -62,14 +62,14 @@ static bool item_selected(shared_ptr r) Header::Header(View &parent) : MarginWidget(parent) { - connect(&view_, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); } QSize Header::sizeHint() const { QRectF max_rect(-Padding, 0, Padding, 0); - for (auto &i : view_) + const vector> items( + view_.list_by_type()); + for (auto &i : items) if (i->enabled()) max_rect = max_rect.united(i->label_rect(QRect())); return QSize(max_rect.width() + Padding + BaselineOffset, 0); @@ -82,16 +82,20 @@ QSize Header::extended_size_hint() const vector< shared_ptr > Header::items() { - return vector< shared_ptr >(view_.begin(), view_.end()); + const vector> items( + view_.list_by_type()); + return vector< shared_ptr >(items.begin(), items.end()); } shared_ptr Header::get_mouse_over_item(const QPoint &pt) { const QRect r(0, 0, width() - BaselineOffset, height()); - for (auto &i : view_) - if (i->enabled() && i->label_rect(r).contains(pt)) - return i; - return shared_ptr(); + const vector> items( + view_.list_by_type()); + for (auto i = items.rbegin(); i != items.rend(); i++) + if ((*i)->enabled() && (*i)->label_rect(r).contains(pt)) + return *i; + return shared_ptr(); } void Header::paintEvent(QPaintEvent*) @@ -101,21 +105,21 @@ void Header::paintEvent(QPaintEvent*) // would be clipped away. const QRect rect(0, 0, width() - BaselineOffset, height()); - vector< shared_ptr > row_items( - view_.begin(), view_.end()); + vector< shared_ptr > items( + view_.list_by_type()); - stable_sort(row_items.begin(), row_items.end(), - [](const shared_ptr &a, const shared_ptr &b) { + stable_sort(items.begin(), items.end(), + [](const shared_ptr &a, const shared_ptr &b) { return a->visual_v_offset() < b->visual_v_offset(); }); QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - for (const shared_ptr r : row_items) + for (const shared_ptr r : items) { assert(r); - const bool highlight = !dragging_ && + const bool highlight = !item_dragging_ && r->label_rect(rect).contains(mouse_point_); r->paint_label(painter, rect, highlight); } @@ -123,52 +127,6 @@ void Header::paintEvent(QPaintEvent*) painter.end(); } -void Header::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); - mouse_point_ = event->pos(); - - if (!(event->buttons() & Qt::LeftButton)) - return; - - if ((event->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - return; - - // Check all the drag items share a common owner - RowItemOwner *item_owner = nullptr; - for (shared_ptr r : view_) - if (r->dragging()) { - if (!item_owner) - item_owner = r->owner(); - else if(item_owner != r->owner()) - return; - } - - if (!item_owner) - return; - - // Do the drag - dragging_ = true; - - const QPoint delta = event->pos() - mouse_down_point_; - - for (std::shared_ptr r : view_) - if (r->dragging()) { - r->drag_by(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(); -} - void Header::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr r = get_mouse_over_item(mouse_point_); @@ -179,7 +137,9 @@ void Header::contextMenuEvent(QContextMenuEvent *event) if (!menu) menu = new QMenu(this); - if (std::count_if(view_.begin(), view_.end(), item_selected) > 1) + const vector< shared_ptr > items( + view_.list_by_type()); + if (std::count_if(items.begin(), items.end(), item_selected) > 1) { menu->addSeparator(); @@ -206,24 +166,21 @@ void Header::keyPressEvent(QKeyEvent *e) on_ungroup(); } -void Header::on_signals_moved() -{ - update(); -} - void Header::on_group() { - vector< shared_ptr > selected_items( - make_filter_iterator(item_selected, view_.begin(), view_.end()), - make_filter_iterator(item_selected, view_.end(), view_.end())); + const vector< shared_ptr > items( + view_.list_by_type()); + vector< shared_ptr > selected_items( + make_filter_iterator(item_selected, items.begin(), items.end()), + make_filter_iterator(item_selected, items.end(), items.end())); stable_sort(selected_items.begin(), selected_items.end(), - [](const shared_ptr &a, const shared_ptr &b) { + [](const shared_ptr &a, const shared_ptr &b) { return a->visual_v_offset() < b->visual_v_offset(); }); shared_ptr group(new TraceGroup()); - shared_ptr mouse_down_item( - std::dynamic_pointer_cast(mouse_down_item_)); - shared_ptr focus_item( + shared_ptr mouse_down_item( + std::dynamic_pointer_cast(mouse_down_item_)); + shared_ptr focus_item( mouse_down_item ? mouse_down_item : selected_items.front()); assert(focus_item); @@ -235,7 +192,7 @@ void Header::on_group() focus_item->v_extents().first); for (size_t i = 0; i < selected_items.size(); i++) { - const shared_ptr &r = selected_items[i]; + const shared_ptr &r = selected_items[i]; assert(r->owner()); r->owner()->remove_child_item(r); group->add_child_item(r); @@ -251,16 +208,15 @@ void Header::on_ungroup() bool restart; do { restart = false; - for (const shared_ptr r : view_) { - const shared_ptr tg = - dynamic_pointer_cast(r); - if (tg && tg->selected()) { + const vector< shared_ptr > groups( + view_.list_by_type()); + for (const shared_ptr tg : groups) + if (tg->selected()) { tg->ungroup(); restart = true; break; } - } - } while(restart); + } while (restart); } } // namespace view