X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=9ba4cf8f8814088749cf20b1909dee6cfec50e7e;hb=e57ee799a5512ce13460b733e7ca08de8f1277cf;hp=653cac483bc0d36ec37b4c57b01f168cf5f3f586;hpb=1ef49ddd04f44a4369403fbab19ed235483e2975;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 653cac48..9ba4cf8f 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -24,7 +24,8 @@ #include "signal.h" #include "../sigsession.h" -#include +#include +#include #include #include @@ -38,6 +39,7 @@ using std::max; using std::make_pair; using std::pair; using std::shared_ptr; +using std::stable_sort; using std::vector; namespace pv { @@ -53,57 +55,55 @@ Header::Header(View &parent) : setFocusPolicy(Qt::ClickFocus); setMouseTracking(true); - connect(&_view.session(), SIGNAL(signals_changed()), - this, SLOT(on_signals_changed())); - connect(&_view, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); - - // Trigger the initial event manually. The default device has signals - // which were created before this object came into being - on_signals_changed(); } QSize Header::sizeHint() const { - int max_width = 0; - - const vector< shared_ptr > traces(_view.get_traces()); - for (shared_ptr t : traces) { - assert(t); - - if (t->enabled()) { - max_width = max(max_width, (int)t->label_rect(0).width()); - } - } - - return QSize(max_width + Padding + BaselineOffset, 0); + 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); } -shared_ptr Header::get_mouse_over_trace(const QPoint &pt) +shared_ptr Header::get_mouse_over_row_item(const QPoint &pt) { const int w = width() - BaselineOffset; - const vector< shared_ptr > traces(_view.get_traces()); - - for (const shared_ptr t : traces) - { - assert(t); - if (t->enabled() && t->label_rect(w).contains(pt)) - return t; - } - - return shared_ptr(); + for (auto &i : _view) + if (i->enabled() && i->label_rect(w).contains(pt)) + return i; + return shared_ptr(); } void Header::clear_selection() { - const vector< shared_ptr > traces(_view.get_traces()); - for (const shared_ptr t : traces) { - assert(t); - t->select(false); + for (auto &i : _view) + i->select(false); + update(); +} + +void Header::signals_updated() +{ + for (shared_ptr r : _view) { + assert(r); + connect(r.get(), SIGNAL(appearance_changed()), + this, SLOT(on_trace_changed())); } +} - update(); +void Header::show_popup(const shared_ptr &item) +{ + using pv::widgets::Popup; + + Popup *const p = item->create_popup(&_view); + if (!p) + return; + + const QPoint pt(width() - BaselineOffset, item->get_y()); + p->set_position(mapToGlobal(pt), Popup::Right); + p->show(); } void Header::paintEvent(QPaintEvent*) @@ -112,99 +112,102 @@ void Header::paintEvent(QPaintEvent*) // left edge of the widget, because then the selection shadow // would be clipped away. const int w = width() - BaselineOffset; - const vector< shared_ptr > traces(_view.get_traces()); + + 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 bool dragging = !_drag_traces.empty(); - for (const shared_ptr t : traces) + const bool dragging = !_drag_row_items.empty(); + for (const shared_ptr r : row_items) { - assert(t); + assert(r); const bool highlight = !dragging && - t->label_rect(w).contains(_mouse_point); - t->paint_label(painter, w, highlight); + r->label_rect(w).contains(_mouse_point); + r->paint_label(painter, w, highlight); } painter.end(); } +void Header::mouseLeftPressEvent(QMouseEvent *event) +{ + const bool ctrl_pressed = + QApplication::keyboardModifiers() & Qt::ControlModifier; + + // Clear selection if control is not pressed and this item is unselected + const shared_ptr mouse_over = + get_mouse_over_row_item(event->pos()); + if (!ctrl_pressed && (!mouse_over || !mouse_over->selected())) + for (shared_ptr r : _view) + r->select(false); + + // Set the signal selection state if the item has been clicked + if (mouse_over) { + if (ctrl_pressed) + mouse_over->select(!mouse_over->selected()); + else + mouse_over->select(true); + } + + // Save the offsets of any signals which will be dragged + _mouse_down_point = event->pos(); + for (const shared_ptr r : _view) + if (r->selected()) + _drag_row_items.push_back( + make_pair(r, r->v_offset())); + + selection_changed(); + update(); +} + void Header::mousePressEvent(QMouseEvent *event) +{ + assert(event); + if (event->button() & Qt::LeftButton) + mouseLeftPressEvent(event); +} + +void Header::mouseLeftReleaseEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > traces(_view.get_traces()); + const bool ctrl_pressed = + QApplication::keyboardModifiers() & Qt::ControlModifier; - if (event->button() & Qt::LeftButton) { - _mouse_down_point = event->pos(); + // Unselect everything if control is not pressed + const shared_ptr mouse_over = + get_mouse_over_row_item(event->pos()); - // Save the offsets of any signals which will be dragged - for (const shared_ptr t : traces) - if (t->selected()) - _drag_traces.push_back( - make_pair(t, t->v_offset())); - } + if (_dragging) + _view.normalize_layout(); + else + { + if (!ctrl_pressed) { + for (shared_ptr r : _view) + if (mouse_over != r) + r->select(false); - // Select the signal if it has been clicked - const shared_ptr mouse_over_trace = - get_mouse_over_trace(event->pos()); - if (mouse_over_trace) { - if (mouse_over_trace->selected()) - mouse_over_trace->select(false); - else { - mouse_over_trace->select(true); - - if (~QApplication::keyboardModifiers() & - Qt::ControlModifier) - _drag_traces.clear(); - - // Add the signal to the drag list - if (event->button() & Qt::LeftButton) - _drag_traces.push_back( - make_pair(mouse_over_trace, - mouse_over_trace->v_offset())); + if (mouse_over) + show_popup(mouse_over); } } - if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { - // Unselect all other signals because the Ctrl is not - // pressed - for (const shared_ptr t : traces) - if (t != mouse_over_trace) - t->select(false); - } - - selection_changed(); - update(); + _dragging = false; + _drag_row_items.clear(); } void Header::mouseReleaseEvent(QMouseEvent *event) { - using pv::widgets::Popup; - assert(event); - if (event->button() == Qt::LeftButton) { - if (_dragging) - _view.normalize_layout(); - else - { - const shared_ptr mouse_over_trace = - get_mouse_over_trace(event->pos()); - if (mouse_over_trace) { - const int w = width() - BaselineOffset; - Popup *const p = - mouse_over_trace->create_popup(&_view); - p->set_position(mapToGlobal(QPoint(w, - mouse_over_trace->get_y())), - Popup::Right); - p->show(); - } - } - - _dragging = false; - _drag_traces.clear(); - } + if (event->button() & Qt::LeftButton) + mouseLeftReleaseEvent(event); } void Header::mouseMoveEvent(QMouseEvent *event) @@ -219,32 +222,40 @@ void Header::mouseMoveEvent(QMouseEvent *event) QApplication::startDragDistance()) return; - // Move the signals if we are dragging - if (!_drag_traces.empty()) - { - _dragging = true; - - const int delta = event->pos().y() - _mouse_down_point.y(); - - for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) { - const std::shared_ptr trace((*i).first); - if (trace) { - const int y = (*i).second + delta; - const int y_snap = - ((y + View::SignalSnapGridSize / 2) / - View::SignalSnapGridSize) * - View::SignalSnapGridSize; - trace->set_v_offset(y_snap); - - // Ensure the trace is selected - trace->select(); - } - - } + // Check the list of dragging items is not empty + if (_drag_row_items.empty()) + return; - signals_moved(); + // Check all the drag items share a common owner + const shared_ptr first_row_item( + _drag_row_items.front().first); + for (const auto &r : _drag_row_items) { + const shared_ptr row_item(r.first); + assert(row_item); + + if (row_item->owner() != first_row_item->owner()) + return; } + // Do the drag + _dragging = true; + + const int delta = event->pos().y() - _mouse_down_point.y(); + + for (auto i = _drag_row_items.begin(); + i != _drag_row_items.end(); i++) { + const std::shared_ptr row_item((*i).first); + if (row_item) { + const int y = (*i).second + delta; + row_item->set_v_offset(y); + + // Ensure the trace is selected + row_item->select(); + } + } + + signals_moved(); + update(); } @@ -256,10 +267,15 @@ void Header::leaveEvent(QEvent*) void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr t = get_mouse_over_trace(_mouse_point); + const shared_ptr r = get_mouse_over_row_item(_mouse_point); + if (!r) + return; - if (t) - t->create_context_menu(this)->exec(event->globalPos()); + QMenu *const menu = r->create_context_menu(this); + if (!menu) + return; + + menu->exec(event->globalPos()); } void Header::keyPressEvent(QKeyEvent *e) @@ -270,29 +286,14 @@ void Header::keyPressEvent(QKeyEvent *e) { case Qt::Key_Delete: { - const vector< shared_ptr > traces(_view.get_traces()); - for (const shared_ptr t : traces) - if (t->selected()) - t->delete_pressed(); + for (const shared_ptr r : _view) + if (r->selected()) + r->delete_pressed(); break; } } } -void Header::on_signals_changed() -{ - const vector< shared_ptr > traces(_view.get_traces()); - for (shared_ptr t : traces) { - assert(t); - connect(t.get(), SIGNAL(visibility_changed()), - this, SLOT(on_trace_changed())); - connect(t.get(), SIGNAL(text_changed()), - this, SLOT(on_trace_changed())); - connect(t.get(), SIGNAL(colour_changed()), - this, SLOT(update())); - } -} - void Header::on_signals_moved() { update();