X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=23cbb0ffa79979d08c764e1809c8248cef406ae3;hp=9ba4cf8f8814088749cf20b1909dee6cfec50e7e;hb=bb419fdd96efe5a08667e6787a55dfbcd2e720a1;hpb=e57ee799a5512ce13460b733e7ca08de8f1277cf diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 9ba4cf8f..23cbb0ff 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -22,11 +22,14 @@ #include "view.h" #include "signal.h" +#include "tracegroup.h" #include "../sigsession.h" #include #include +#include + #include #include #include @@ -35,8 +38,11 @@ #include +using boost::make_filter_iterator; +using std::dynamic_pointer_cast; using std::max; using std::make_pair; +using std::min; using std::pair; using std::shared_ptr; using std::stable_sort; @@ -48,6 +54,11 @@ namespace view { const int Header::Padding = 12; const int Header::BaselineOffset = 5; +static bool item_selected(shared_ptr r) +{ + return r->selected(); +} + Header::Header(View &parent) : MarginWidget(parent), _dragging(false) @@ -84,15 +95,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 +103,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,17 +120,16 @@ 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); - const bool dragging = !_drag_row_items.empty(); for (const shared_ptr r : row_items) { assert(r); - const bool highlight = !dragging && + const bool highlight = !_dragging && r->label_rect(w).contains(_mouse_point); r->paint_label(painter, w, highlight); } @@ -138,30 +139,29 @@ void Header::paintEvent(QPaintEvent*) void Header::mouseLeftPressEvent(QMouseEvent *event) { + (void)event; + const bool ctrl_pressed = QApplication::keyboardModifiers() & Qt::ControlModifier; // Clear selection if control is not pressed and this item is unselected - const shared_ptr mouse_over = - get_mouse_over_row_item(event->pos()); - if (!ctrl_pressed && (!mouse_over || !mouse_over->selected())) + if ((!_mouse_down_item || !_mouse_down_item->selected()) && + !ctrl_pressed) for (shared_ptr r : _view) r->select(false); // Set the signal selection state if the item has been clicked - if (mouse_over) { + if (_mouse_down_item) { if (ctrl_pressed) - mouse_over->select(!mouse_over->selected()); + _mouse_down_item->select(!_mouse_down_item->selected()); else - mouse_over->select(true); + _mouse_down_item->select(true); } // Save the offsets of any signals which will be dragged - _mouse_down_point = event->pos(); for (const shared_ptr r : _view) if (r->selected()) - _drag_row_items.push_back( - make_pair(r, r->v_offset())); + r->drag(); selection_changed(); update(); @@ -170,6 +170,10 @@ void Header::mouseLeftPressEvent(QMouseEvent *event) void Header::mousePressEvent(QMouseEvent *event) { assert(event); + + _mouse_down_point = event->pos(); + _mouse_down_item = get_mouse_over_row_item(event->pos()); + if (event->button() & Qt::LeftButton) mouseLeftPressEvent(event); } @@ -185,22 +189,24 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event) const shared_ptr mouse_over = get_mouse_over_row_item(event->pos()); + for (auto &r : _view) + r->drag_release(); + if (_dragging) - _view.normalize_layout(); + _view.restack_all_row_items(); else { if (!ctrl_pressed) { for (shared_ptr r : _view) - if (mouse_over != r) + if (_mouse_down_item != r) r->select(false); - if (mouse_over) - show_popup(mouse_over); + if (_mouse_down_item) + show_popup(_mouse_down_item); } } _dragging = false; - _drag_row_items.clear(); } void Header::mouseReleaseEvent(QMouseEvent *event) @@ -208,6 +214,8 @@ void Header::mouseReleaseEvent(QMouseEvent *event) assert(event); if (event->button() & Qt::LeftButton) mouseLeftReleaseEvent(event); + + _mouse_down_item = nullptr; } void Header::mouseMoveEvent(QMouseEvent *event) @@ -222,38 +230,35 @@ void Header::mouseMoveEvent(QMouseEvent *event) QApplication::startDragDistance()) return; - // Check the list of dragging items is not empty - if (_drag_row_items.empty()) - return; - // Check all the drag items share a common owner - const shared_ptr first_row_item( - _drag_row_items.front().first); - for (const auto &r : _drag_row_items) { - const shared_ptr row_item(r.first); - assert(row_item); - - if (row_item->owner() != first_row_item->owner()) - return; - } + 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 int delta = event->pos().y() - _mouse_down_point.y(); - for (auto i = _drag_row_items.begin(); - i != _drag_row_items.end(); i++) { - const std::shared_ptr row_item((*i).first); - if (row_item) { - const int y = (*i).second + delta; - row_item->set_v_offset(y); + for (std::shared_ptr r : _view) + if (r->dragging()) { + r->force_to_v_offset(r->drag_point().y() + delta); // Ensure the trace is selected - row_item->select(); + r->select(); } - } + item_owner->restack_items(); + for (const auto &r : *item_owner) + r->animate_to_layout_v_offset(); signals_moved(); update(); @@ -271,9 +276,21 @@ void Header::contextMenuEvent(QContextMenuEvent *event) if (!r) return; - QMenu *const menu = r->create_context_menu(this); + QMenu *menu = r->create_context_menu(this); if (!menu) - return; + menu = new QMenu(this); + + if (std::count_if(_view.begin(), _view.end(), item_selected) > 1) + { + menu->addSeparator(); + + QAction *const group = new QAction(tr("Group"), this); + QList shortcuts; + shortcuts.append(QKeySequence(Qt::ControlModifier | Qt::Key_G)); + group->setShortcuts(shortcuts); + connect(group, SIGNAL(triggered()), this, SLOT(on_group())); + menu->addAction(group); + } menu->exec(event->globalPos()); } @@ -299,10 +316,54 @@ void Header::on_signals_moved() update(); } -void Header::on_trace_changed() +void Header::on_group() { - update(); - geometry_updated(); + vector< shared_ptr > selected_items( + make_filter_iterator(item_selected, _view.begin(), _view.end()), + make_filter_iterator(item_selected, _view.end(), _view.end())); + stable_sort(selected_items.begin(), selected_items.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->visual_v_offset() < b->visual_v_offset(); }); + + shared_ptr group(new TraceGroup()); + shared_ptr focus_item( + _mouse_down_item ? _mouse_down_item : selected_items.front()); + + assert(focus_item); + assert(focus_item->owner()); + focus_item->owner()->add_child_item(group); + + // Set the group v_offset here before reparenting + group->force_to_v_offset(focus_item->layout_v_offset() + + focus_item->v_extents().first); + + for (size_t i = 0; i < selected_items.size(); i++) { + const shared_ptr &r = selected_items[i]; + assert(r->owner()); + r->owner()->remove_child_item(r); + group->add_child_item(r); + + // Put the items at 1-pixel offsets, so that restack will + // stack them in the right order + r->set_layout_v_offset(i); + } +} + +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()) { + tg->ungroup(); + restart = true; + break; + } + } + } while(restart); } } // namespace view