X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=60d64b2f401f2483aad1226dc00e66d62ca54191;hp=6d016fe0b441aa832a504e64704fd564ac67d59c;hb=af503b104d890a357c736c678bb00296d889c090;hpb=2c982fc3905ef4d4fa1d87761d3ac14841f01de1 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 6d016fe0..60d64b2f 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -18,237 +18,197 @@ * 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 #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 { -Header::Header(View &parent) : - QWidget(&parent), - _view(parent), - _action_set_name(new QAction(tr("Set &Name..."), this)), - _action_set_colour(new QAction(tr("Set &Colour..."), this)) -{ - setMouseTracking(true); +const int Header::Padding = 12; +const int Header::BaselineOffset = 5; - connect(_action_set_name, SIGNAL(triggered()), - this, SLOT(on_action_set_name_triggered())); - connect(_action_set_colour, SIGNAL(triggered()), - this, SLOT(on_action_set_colour_triggered())); +static bool item_selected(shared_ptr r) +{ + return r->selected(); +} - connect(&_view, SIGNAL(signals_moved()), - this, SLOT(on_signals_moved())); +Header::Header(View &parent) : + MarginWidget(parent) +{ } -boost::shared_ptr Header::get_mouse_over_signal( - const QPoint &pt) +QSize Header::sizeHint() const { - const int w = width(); - const vector< shared_ptr > sigs( - _view.session().get_signals()); + QRectF max_rect(-Padding, 0, Padding, 0); + for (auto &i : view_) + if (i->enabled()) + max_rect = max_rect.united(i->label_rect(QRect())); + return QSize(max_rect.width() + Padding + BaselineOffset, 0); +} - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); +QSize Header::extended_size_hint() const +{ + return sizeHint() + QSize(ViewItem::HighlightRadius, 0); +} - if (s->pt_in_label_rect(s->get_v_offset() - v_offset, - 0, w, pt)) - return s; - } +vector< shared_ptr > Header::items() +{ + return vector< shared_ptr >(view_.begin(), view_.end()); +} - return shared_ptr(); +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(); } 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_.begin(), view_.end()); + + 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); - const int v_offset = _view.v_offset(); - const bool dragging = !_drag_sigs.empty(); - BOOST_FOREACH(const shared_ptr s, sigs) + for (const shared_ptr r : items) { - assert(s); + assert(r); - const int y = s->get_v_offset() - v_offset; - const bool highlight = !dragging && s->pt_in_label_rect( - y, 0, w, _mouse_point); - s->paint_label(painter, y, w, highlight); + const bool highlight = !item_dragging_ && + r->label_rect(rect).contains(mouse_point_); + r->paint_label(painter, rect, highlight); } painter.end(); } -void Header::mousePressEvent(QMouseEvent *event) -{ - assert(event); - - const vector< shared_ptr > sigs( - _view.session().get_signals()); - - if (event->button() & Qt::LeftButton) { - _mouse_down_point = event->pos(); - - // Save the offsets of any signals which will be dragged - BOOST_FOREACH(const shared_ptr s, sigs) - if (s->selected()) - _drag_sigs.push_back( - make_pair(s, s->get_v_offset())); - } - - // Select the signal if it has been clicked - const shared_ptr mouse_over_signal = - get_mouse_over_signal(event->pos()); - if (mouse_over_signal) { - if (mouse_over_signal->selected()) - mouse_over_signal->select(false); - else { - mouse_over_signal->select(true); - - if (~QApplication::keyboardModifiers() & - Qt::ControlModifier) - _drag_sigs.clear(); - - // Add the signal to the drag list - if (event->button() & Qt::LeftButton) - _drag_sigs.push_back( - make_pair(mouse_over_signal, - mouse_over_signal->get_v_offset())); - } - } - - if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { - // Unselect all other signals because the Ctrl is not - // pressed - BOOST_FOREACH(const shared_ptr s, sigs) - if (s != mouse_over_signal) - s->select(false); - } - - update(); -} - -void Header::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); - if (event->button() == Qt::LeftButton) { - _drag_sigs.clear(); - _view.normalize_layout(); - } -} - -void Header::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); - _mouse_point = event->pos(); - - // Move the signals if we are dragging - if (!_drag_sigs.empty()) { - const int delta = event->pos().y() - _mouse_down_point.y(); - - for (std::list, - int> >::iterator i = _drag_sigs.begin(); - i != _drag_sigs.end(); i++) { - const boost::shared_ptr sig((*i).first); - if (sig) { - const int y = (*i).second + delta; - const int y_snap = - ((y + View::SignalSnapGridSize / 2) / - View::SignalSnapGridSize) * - View::SignalSnapGridSize; - sig->set_v_offset(y_snap); - - // Ensure the signal is selected - sig->select(); - } - - } - - signals_moved(); - } - - update(); -} - -void Header::leaveEvent(QEvent*) -{ - _mouse_point = QPoint(-1, -1); - update(); -} - void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr s = get_mouse_over_signal(_mouse_point); - - if (!s) + const shared_ptr r = get_mouse_over_item(mouse_point_); + if (!r) return; - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); + QMenu *menu = r->create_context_menu(this); + if (!menu) + menu = new QMenu(this); - _context_signal = s; - menu.exec(event->globalPos()); - _context_signal.reset(); + 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()); } -void Header::on_action_set_name_triggered() +void Header::keyPressEvent(QKeyEvent *e) { - bool ok = false; - - shared_ptr context_signal = _context_signal; - if (!context_signal) - return; + assert(e); - const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok); + MarginWidget::keyPressEvent(e); - if (ok) - context_signal->set_name(new_label); + 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_action_set_colour_triggered() +void Header::on_group() { - shared_ptr context_signal = _context_signal; - if (!context_signal) - return; - - const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); - - if (new_colour.isValid()) - context_signal->set_colour(new_colour); + 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 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::on_signals_moved() +void Header::on_ungroup() { - update(); + 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