X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=60d64b2f401f2483aad1226dc00e66d62ca54191;hp=91a6ecfddc3415288ab2f9e0f6fd45305ec4c07a;hb=af503b104d890a357c736c678bb00296d889c090;hpb=73ba2d70ce244f3582045498ace31f54485c316f diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 91a6ecfd..60d64b2f 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -18,12 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "header.h" -#include "view.h" +#include "header.hpp" +#include "view.hpp" -#include "signal.h" -#include "tracegroup.h" -#include "../sigsession.h" +#include "signal.hpp" +#include "tracegroup.hpp" #include #include @@ -36,9 +35,11 @@ #include #include -#include +#include +#include using boost::make_filter_iterator; +using std::dynamic_pointer_cast; using std::max; using std::make_pair; using std::min; @@ -53,58 +54,42 @@ 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(); } Header::Header(View &parent) : - MarginWidget(parent), - _dragging(false) + MarginWidget(parent) { - setFocusPolicy(Qt::ClickFocus); - setMouseTracking(true); - - 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) + for (auto &i : view_) if (i->enabled()) - max_rect = max_rect.united(i->label_rect(0)); + max_rect = max_rect.united(i->label_rect(QRect())); 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 { - const int w = width() - BaselineOffset; - for (auto &i : _view) - if (i->enabled() && i->label_rect(w).contains(pt)) - return i; - return shared_ptr(); + return sizeHint() + QSize(ViewItem::HighlightRadius, 0); } -void Header::clear_selection() +vector< shared_ptr > Header::items() { - for (auto &i : _view) - i->select(false); - update(); + return vector< shared_ptr >(view_.begin(), view_.end()); } -void Header::show_popup(const shared_ptr &item) +shared_ptr Header::get_mouse_over_item(const QPoint &pt) { - using pv::widgets::Popup; - - Popup *const p = item->create_popup(&_view); - if (!p) - return; - - const QPoint pt(width() - BaselineOffset, item->get_visual_y()); - p->set_position(mapToGlobal(pt), Popup::Right); - p->show(); + 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(); } void Header::paintEvent(QPaintEvent*) @@ -112,166 +97,33 @@ void Header::paintEvent(QPaintEvent*) // The trace labels are not drawn with the arrows exactly on the // left edge of the widget, because then the selection shadow // would be clipped away. - const int w = width() - BaselineOffset; + const QRect rect(0, 0, width() - BaselineOffset, height()); - vector< shared_ptr > row_items( - _view.begin(), _view.end()); + vector< shared_ptr > items( + view_.begin(), view_.end()); - 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 && - r->label_rect(w).contains(_mouse_point); - r->paint_label(painter, w, highlight); + const bool highlight = !item_dragging_ && + r->label_rect(rect).contains(mouse_point_); + r->paint_label(painter, rect, highlight); } 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; @@ -279,7 +131,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event) if (!menu) menu = new QMenu(this); - if (std::count_if(_view.begin(), _view.end(), item_selected) > 1) + if (std::count_if(view_.begin(), view_.end(), item_selected) > 1) { menu->addSeparator(); @@ -298,35 +150,28 @@ void Header::keyPressEvent(QKeyEvent *e) { assert(e); - switch (e->key()) - { - case Qt::Key_Delete: - { - for (const shared_ptr r : _view) - if (r->selected()) - r->delete_pressed(); - break; - } - } -} + MarginWidget::keyPressEvent(e); -void Header::on_signals_moved() -{ - update(); + 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(); } 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())); + 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) { + [](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()); + 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); assert(focus_item->owner()); @@ -337,7 +182,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); @@ -348,5 +193,22 @@ void Header::on_group() } } +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 } // namespace pv