X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=3530d891b5f7edf6bde111c70f7202ab2849e718;hb=b434cbaf3208c2037fd5f86001b367b46ba926ba;hp=4b02c1944d35540bf78f1c220716b213ce4433e4;hpb=dbfae3f1b55b984c7ee7e619a8da53b77db98c90;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 4b02c19..3530d89 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -75,7 +75,17 @@ QSize Header::sizeHint() const return QSize(max_rect.width() + Padding + BaselineOffset, 0); } -shared_ptr Header::get_mouse_over_row_item(const QPoint &pt) +QSize Header::extended_size_hint() const +{ + return sizeHint() + QSize(ViewItem::HighlightRadius, 0); +} + +vector< shared_ptr > Header::items() +{ + return vector< shared_ptr >(view_.begin(), view_.end()); +} + +shared_ptr Header::get_mouse_over_item(const QPoint &pt) { const QRect r(0, 0, width() - BaselineOffset, height()); for (auto &i : view_) @@ -84,24 +94,22 @@ shared_ptr Header::get_mouse_over_row_item(const QPoint &pt) return shared_ptr(); } -void Header::clear_selection() -{ - for (auto &i : view_) - i->select(false); - update(); -} - -void Header::show_popup(const shared_ptr &item) +void Header::drag_items(const QPoint &delta) { - using pv::widgets::Popup; + RowItemOwner *item_owner = nullptr; + for (std::shared_ptr r : view_) + if (r->dragging()) { + item_owner = r->owner(); + r->drag_by(delta); - Popup *const p = item->create_popup(&view_); - if (!p) - return; + // Ensure the trace is selected + r->select(); + } - const QPoint pt(width() - BaselineOffset, item->get_visual_y()); - p->set_position(mapToGlobal(pt), Popup::Right); - p->show(); + item_owner->restack_items(); + for (const auto &r : *item_owner) + r->animate_to_layout_v_offset(); + signals_moved(); } void Header::paintEvent(QPaintEvent*) @@ -133,142 +141,9 @@ void Header::paintEvent(QPaintEvent*) painter.end(); } -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 - 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_down_item_) { - if (ctrl_pressed) - mouse_down_item_->select(!mouse_down_item_->selected()); - else - mouse_down_item_->select(true); - } - - // Save the offsets of any signals which will be dragged - for (const shared_ptr r : view_) - if (r->selected()) - r->drag(); - - selection_changed(); - update(); -} - -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); -} - -void Header::mouseLeftReleaseEvent(QMouseEvent *event) -{ - assert(event); - - const bool ctrl_pressed = - QApplication::keyboardModifiers() & Qt::ControlModifier; - - // Unselect everything if control is not pressed - const shared_ptr mouse_over = - get_mouse_over_row_item(event->pos()); - - for (auto &r : view_) - r->drag_release(); - - if (dragging_) - view_.restack_all_row_items(); - else - { - if (!ctrl_pressed) { - for (shared_ptr r : view_) - if (mouse_down_item_ != r) - r->select(false); - - if (mouse_down_item_) - show_popup(mouse_down_item_); - } - } - - dragging_ = false; -} - -void Header::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); - if (event->button() & Qt::LeftButton) - mouseLeftReleaseEvent(event); - - mouse_down_item_ = nullptr; -} - -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 int delta = event->pos().y() - mouse_down_point_.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 - r->select(); - } - - item_owner->restack_items(); - for (const auto &r : *item_owner) - r->animate_to_layout_v_offset(); - signals_moved(); - - update(); -} - -void Header::leaveEvent(QEvent*) -{ - mouse_point_ = QPoint(-1, -1); - update(); -} - void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr r = get_mouse_over_row_item(mouse_point_); + const shared_ptr r = get_mouse_over_item(mouse_point_); if (!r) return; @@ -295,13 +170,9 @@ void Header::keyPressEvent(QKeyEvent *e) { assert(e); - if (e->key() == Qt::Key_Delete) - { - for (const shared_ptr r : view_) - if (r->selected()) - r->delete_pressed(); - } - else if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier) + MarginWidget::keyPressEvent(e); + + if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier) on_group(); else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier) on_ungroup(); @@ -322,8 +193,10 @@ void Header::on_group() 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( - mouse_down_item_ ? mouse_down_item_ : selected_items.front()); + mouse_down_item ? mouse_down_item : selected_items.front()); assert(focus_item); assert(focus_item->owner());