X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=5e978a70252565cf47f4a3bb95712707a813842d;hp=ba16247a8c8e5609245bc8233943295ff068b32b;hb=68b21a71797051fb48ed272bc2a6b4893bdbf517;hpb=91e8bf08c9799cb1041d26bf2ff6b67abf9a420b diff --git a/pv/view/header.cpp b/pv/view/header.cpp index ba16247a..5e978a70 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -24,9 +24,8 @@ #include "signal.h" #include "../sigsession.h" -#include - -#include +#include +#include #include #include @@ -36,16 +35,24 @@ #include -using namespace boost; -using namespace std; +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) : MarginWidget(parent), _dragging(false) { + setFocusPolicy(Qt::ClickFocus); setMouseTracking(true); connect(&_view.session(), SIGNAL(signals_changed()), @@ -53,29 +60,49 @@ Header::Header(View &parent) : 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 > row_items(_view.child_items()); + for (shared_ptr r : row_items) { + assert(r); + + if (r->enabled()) { + max_width = max(max_width, (int)r->label_rect(0).width()); + } + } + + return QSize(max_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(); - const vector< shared_ptr > traces(_view.get_traces()); + const int w = width() - BaselineOffset; + const vector< shared_ptr > row_items(_view.child_items()); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr r : row_items) { - assert(t); - if (t->pt_in_label_rect(0, w, pt)) - return t; + assert(r); + if (r->enabled() && r->label_rect(w).contains(pt)) + return r; } - return shared_ptr(); + return shared_ptr(); } void Header::clear_selection() { - const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(const shared_ptr t, traces) { - assert(t); - t->select(false); + const vector< shared_ptr > row_items(_view.child_items()); + for (const shared_ptr r : row_items) { + assert(r); + r->select(false); } update(); @@ -83,20 +110,27 @@ void Header::clear_selection() void Header::paintEvent(QPaintEvent*) { - const int w = width(); - const vector< shared_ptr > traces(_view.get_traces()); + // 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.child_items()); + 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(); - BOOST_FOREACH(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->pt_in_label_rect( - 0, w, _mouse_point); - t->paint_label(painter, w, highlight); + const bool highlight = !dragging && + r->label_rect(w).contains(_mouse_point); + r->paint_label(painter, w, highlight); } painter.end(); @@ -106,45 +140,45 @@ void Header::mousePressEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > traces(_view.get_traces()); + const vector< shared_ptr > row_items(_view.child_items()); 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 t, traces) - if (t->selected()) - _drag_traces.push_back( - make_pair(t, t->get_v_offset())); + for (const shared_ptr r : row_items) + if (r->selected()) + _drag_row_items.push_back( + make_pair(r, r->v_offset())); } // 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); + const shared_ptr mouse_over_row_item = + get_mouse_over_row_item(event->pos()); + if (mouse_over_row_item) { + if (mouse_over_row_item->selected()) + mouse_over_row_item->select(false); else { - mouse_over_trace->select(true); + mouse_over_row_item->select(true); if (~QApplication::keyboardModifiers() & Qt::ControlModifier) - _drag_traces.clear(); + _drag_row_items.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->get_v_offset())); + _drag_row_items.push_back( + make_pair(mouse_over_row_item, + mouse_over_row_item->v_offset())); } } if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { // Unselect all other signals because the Ctrl is not // pressed - BOOST_FOREACH(const shared_ptr t, traces) - if (t != mouse_over_trace) - t->select(false); + for (const shared_ptr r : row_items) + if (r != mouse_over_row_item) + r->select(false); } selection_changed(); @@ -161,20 +195,21 @@ void Header::mouseReleaseEvent(QMouseEvent *event) _view.normalize_layout(); else { - const shared_ptr mouse_over_trace = - get_mouse_over_trace(event->pos()); - if (mouse_over_trace) { + const shared_ptr mouse_over_row_item = + get_mouse_over_row_item(event->pos()); + if (mouse_over_row_item) { + const int w = width() - BaselineOffset; Popup *const p = - mouse_over_trace->create_popup(&_view); - p->set_position(mapToGlobal(QPoint(width(), - mouse_over_trace->get_y())), + mouse_over_row_item->create_popup(&_view); + p->set_position(mapToGlobal(QPoint(w, + mouse_over_row_item->get_y())), Popup::Right); p->show(); } } _dragging = false; - _drag_traces.clear(); + _drag_row_items.clear(); } } @@ -191,26 +226,25 @@ void Header::mouseMoveEvent(QMouseEvent *event) return; // Move the signals if we are dragging - if (!_drag_traces.empty()) + if (!_drag_row_items.empty()) { _dragging = true; const int delta = event->pos().y() - _mouse_down_point.y(); - for (std::list, - int> >::iterator i = _drag_traces.begin(); - i != _drag_traces.end(); i++) { - const boost::shared_ptr trace((*i).first); - if (trace) { + 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; const int y_snap = ((y + View::SignalSnapGridSize / 2) / View::SignalSnapGridSize) * View::SignalSnapGridSize; - trace->set_v_offset(y_snap); + row_item->set_v_offset(y_snap); // Ensure the trace is selected - trace->select(); + row_item->select(); } } @@ -229,20 +263,39 @@ 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 (t) - t->create_context_menu(this)->exec(event->globalPos()); + if (r) + r->create_context_menu(this)->exec(event->globalPos()); +} + +void Header::keyPressEvent(QKeyEvent *e) +{ + assert(e); + + switch (e->key()) + { + case Qt::Key_Delete: + { + const vector< shared_ptr > row_items(_view.child_items()); + for (const shared_ptr r : row_items) + if (r->selected()) + r->delete_pressed(); + break; + } + } } void Header::on_signals_changed() { - const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { - assert(t); - connect(t.get(), SIGNAL(text_changed()), - this, SLOT(update())); - connect(t.get(), SIGNAL(colour_changed()), + const vector< shared_ptr > row_items(_view.child_items()); + for (shared_ptr r : row_items) { + assert(r); + connect(r.get(), SIGNAL(visibility_changed()), + this, SLOT(on_trace_changed())); + connect(r.get(), SIGNAL(text_changed()), + this, SLOT(on_trace_changed())); + connect(r.get(), SIGNAL(colour_changed()), this, SLOT(update())); } } @@ -252,6 +305,11 @@ void Header::on_signals_moved() update(); } +void Header::on_trace_changed() +{ + update(); + geometry_updated(); +} } // namespace view } // namespace pv