X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=ba0f9e61affba6c9314dfd66437142f99b6ce296;hp=4eebf1f5dcb25d29224a6885d850ab1f25b4a2e4;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=a29bb7fb6aa3665c21da1e06a3d3c4ca80f4437f diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 4eebf1f5..ba0f9e61 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -18,71 +18,204 @@ * 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 "../sigsession.h" +#include "signal.hpp" +#include "tracegroup.hpp" -#include +#include +#include -#include +#include +#include +#include #include #include #include -using namespace boost; -using namespace std; +#include +#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; +using std::vector; namespace pv { 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) : - QWidget(&parent), - _view(parent) + MarginWidget(parent) +{ +} + +QSize Header::sizeHint() const +{ + QRectF max_rect(-Padding, 0, Padding, 0); + 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); +} + +QSize Header::extended_size_hint() const +{ + return sizeHint() + QSize(ViewItem::HighlightRadius, 0); +} + +vector< shared_ptr > Header::items() +{ + 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) { - setMouseTracking(true); + const QRect r(0, 0, width() - BaselineOffset, height()); + 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 *event) +void Header::paintEvent(QPaintEvent*) { - const int w = width(); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + // 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 QRect rect(0, 0, width() - BaselineOffset, height()); + + vector< shared_ptr > items( + view_.list_by_type()); + + stable_sort(items.begin(), items.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->point(QRect()).y() < b->point(QRect()).y(); }); QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - int offset = -_view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); + for (const shared_ptr r : items) { + assert(r); + + const bool highlight = !item_dragging_ && + r->label_rect(rect).contains(mouse_point_); + r->paint_label(painter, rect, highlight); + } - const QRect signal_heading_rect( - 0, offset, w, View::SignalHeight); + painter.end(); +} + +void Header::contextMenuEvent(QContextMenuEvent *event) +{ + const shared_ptr r = get_mouse_over_item(mouse_point_); + if (!r) + return; - s->paint_label(painter, signal_heading_rect, - s->pt_in_label_rect(painter, - signal_heading_rect, _mouse_point)); + QMenu *menu = r->create_context_menu(this); + if (!menu) + menu = new QMenu(this); - offset += View::SignalHeight; + const vector< shared_ptr > items( + view_.list_by_type()); + if (std::count_if(items.begin(), items.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); } - painter.end(); + menu->exec(event->globalPos()); } -void Header::mouseMoveEvent(QMouseEvent *event) +void Header::keyPressEvent(QKeyEvent *event) { assert(event); - _mouse_point = event->pos(); - update(); + + MarginWidget::keyPressEvent(event); + + if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier) + on_group(); + else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier) + on_ungroup(); +} + +void Header::on_group() +{ + 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) { + 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()); + + 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::leaveEvent(QEvent *event) +void Header::on_ungroup() { - _mouse_point = QPoint(-1, -1); - update(); + bool restart; + do { + restart = false; + 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); } } // namespace view