X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=514a3e49694e348dc08123749da90ff0290d1f67;hp=63679012a52947d92b7d1fc67f40948a042f339b;hb=4f82e4f613aced3594f07fa219a9d8c247eaed11;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 63679012..514a3e49 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -24,147 +24,194 @@ #include "signal.h" #include "../sigsession.h" -#include - -#include +#include +#include #include -#include -#include #include #include #include #include -using namespace boost; -using namespace std; +#include + +using std::max; +using std::make_pair; +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; + 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)) + MarginWidget(parent), + _dragging(false) { + setFocusPolicy(Qt::ClickFocus); setMouseTracking(true); - 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())); - connect(&_view, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); } -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(0)); + return QSize(max_rect.width() + Padding + BaselineOffset, 0); +} - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); +shared_ptr Header::get_mouse_over_row_item(const QPoint &pt) +{ + const int w = width() - BaselineOffset; + for (auto &i : _view) + if (i->enabled() && i->label_rect(w).contains(pt)) + return i; + return shared_ptr(); +} - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); +void Header::clear_selection() +{ + for (auto &i : _view) + i->select(false); + update(); +} - if (s->pt_in_label_rect(signal_heading_rect, pt)) - return s; +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; + + Popup *const p = item->create_popup(&_view); + if (!p) + return; - return shared_ptr(); + const QPoint pt(width() - BaselineOffset, item->get_y()); + p->set_position(mapToGlobal(pt), Popup::Right); + p->show(); } -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 int w = width() - BaselineOffset; + + vector< shared_ptr > row_items( + _view.begin(), _view.end()); + + stable_sort(row_items.begin(), row_items.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->v_offset() < b->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 : row_items) { - assert(s); - - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); + assert(r); - const bool highlight = !dragging && s->pt_in_label_rect( - signal_heading_rect, _mouse_point); - s->paint_label(painter, signal_heading_rect, highlight); + const bool highlight = !_dragging && + r->label_rect(w).contains(_mouse_point); + r->paint_label(painter, w, 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); - const vector< shared_ptr > sigs( - _view.session().get_signals()); + _mouse_down_point = event->pos(); + _mouse_down_item = get_mouse_over_row_item(event->pos()); - if (event->button() & Qt::LeftButton) { - _mouse_down_point = event->pos(); + if (event->button() & Qt::LeftButton) + mouseLeftPressEvent(event); +} - // 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())); - } +void Header::mouseLeftReleaseEvent(QMouseEvent *event) +{ + assert(event); - // 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())); - } - } + 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()); - 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); + for (auto &r : _view) + r->drag_release(); + + if (!_dragging) + { + 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); + } } - update(); + _dragging = false; } void Header::mouseReleaseEvent(QMouseEvent *event) { assert(event); - if (event->button() == Qt::LeftButton) { - _drag_sigs.clear(); - _view.normalize_layout(); - } + if (event->button() & Qt::LeftButton) + mouseLeftReleaseEvent(event); + + _mouse_down_item = nullptr; } void Header::mouseMoveEvent(QMouseEvent *event) @@ -172,35 +219,45 @@ 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(); - } - + 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; } - signals_moved(); - } + 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->set_v_offset(r->drag_point().y() + delta); + + // Ensure the trace is selected + r->select(); + } + + signals_moved(); update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update(); @@ -208,44 +265,31 @@ void Header::leaveEvent(QEvent *event) void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr s = get_mouse_over_signal(_mouse_point); - - if (!s) + const shared_ptr r = get_mouse_over_row_item(_mouse_point); + if (!r) return; - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); - - _context_signal = s; - menu.exec(event->globalPos()); - _context_signal.reset(); -} - -void Header::on_action_set_name_triggered() -{ - shared_ptr context_signal = _context_signal; - if (!context_signal) + QMenu *const menu = r->create_context_menu(this); + if (!menu) return; - const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_signal->get_name()); - - if (!new_label.isEmpty()) - context_signal->set_name(new_label); + menu->exec(event->globalPos()); } -void Header::on_action_set_colour_triggered() +void Header::keyPressEvent(QKeyEvent *e) { - shared_ptr context_signal = _context_signal; - if (!context_signal) - return; + assert(e); - const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); - - if (new_colour.isValid()) - context_signal->set_colour(new_colour); + switch (e->key()) + { + case Qt::Key_Delete: + { + for (const shared_ptr r : _view) + if (r->selected()) + r->delete_pressed(); + break; + } + } } void Header::on_signals_moved() @@ -253,6 +297,11 @@ void Header::on_signals_moved() update(); } +void Header::on_trace_changed() +{ + update(); + geometry_updated(); +} } // namespace view } // namespace pv