X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=cda0848984a8cbf3d3ae144b5dc139703e929c5c;hp=fd40e216e196f0bd6b7a2fb09c52bf70061edcf3;hb=14009012e02866aa8e8d338026901d180d00fcc6;hpb=9e40e83daf6a2851f4883468a4237849f984b336 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index fd40e216..cda08489 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -24,94 +24,113 @@ #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) : MarginWidget(parent), - _action_set_name(new QAction(tr("Set &Name..."), this)), - _action_set_colour(new QAction(tr("Set &Colour..."), this)) + _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.session(), SIGNAL(signals_changed()), - this, SLOT(on_signals_changed())); - 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()); - - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); - - if (s->pt_in_label_rect(s->get_v_offset() - v_offset, - 0, w, pt)) - return s; - } + 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); +} - return shared_ptr(); +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(); } void Header::clear_selection() { - const vector< shared_ptr > sigs( - _view.session().get_signals()); - BOOST_FOREACH(const shared_ptr s, sigs) { - assert(s); - s->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*) { - 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) + const bool dragging = !_drag_row_items.empty(); + for (const shared_ptr r : row_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 = !dragging && + r->label_rect(w).contains(_mouse_point); + r->paint_label(painter, w, highlight); } painter.end(); @@ -121,46 +140,43 @@ 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())); + for (const shared_ptr r : _view) + 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_signal = - get_mouse_over_signal(event->pos()); - if (mouse_over_signal) { - if (mouse_over_signal->selected()) - mouse_over_signal->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_signal->select(true); + mouse_over_row_item->select(true); if (~QApplication::keyboardModifiers() & Qt::ControlModifier) - _drag_sigs.clear(); + _drag_row_items.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())); + _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 s, sigs) - if (s != mouse_over_signal) - s->select(false); + for (const shared_ptr r : _view) + if (r != mouse_over_row_item) + r->select(false); } selection_changed(); @@ -171,8 +187,18 @@ void Header::mouseReleaseEvent(QMouseEvent *event) { assert(event); if (event->button() == Qt::LeftButton) { - _drag_sigs.clear(); - _view.normalize_layout(); + if (_dragging) + _view.normalize_layout(); + else + { + const shared_ptr mouse_over_row_item = + get_mouse_over_row_item(event->pos()); + if (mouse_over_row_item) + show_popup(mouse_over_row_item); + } + + _dragging = false; + _drag_row_items.clear(); } } @@ -181,24 +207,33 @@ void Header::mouseMoveEvent(QMouseEvent *event) assert(event); _mouse_point = event->pos(); + if (!(event->buttons() & Qt::LeftButton)) + return; + + if ((event->pos() - _mouse_down_point).manhattanLength() < + QApplication::startDragDistance()) + return; + // Move the signals if we are dragging - if (!_drag_sigs.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_sigs.begin(); - i != _drag_sigs.end(); i++) { - const boost::shared_ptr sig((*i).first); - if (sig) { + 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; - sig->set_v_offset(y_snap); + row_item->set_v_offset(y_snap); - // Ensure the signal is selected - sig->select(); + // Ensure the trace is selected + row_item->select(); } } @@ -217,54 +252,30 @@ void Header::leaveEvent(QEvent*) 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() -{ - bool ok = false; - - 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(), &ok); - - if (ok) - 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; - - const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); + assert(e); - if (new_colour.isValid()) - context_signal->set_colour(new_colour); -} - -void Header::on_signals_changed() -{ - const vector< shared_ptr > sigs(_view.session().get_signals()); - BOOST_FOREACH(shared_ptr s, sigs) { - assert(s); - connect(s.get(), SIGNAL(text_changed()), this, SLOT(update())); + switch (e->key()) + { + case Qt::Key_Delete: + { + for (const shared_ptr r : _view) + if (r->selected()) + r->delete_pressed(); + break; + } } } @@ -273,6 +284,11 @@ void Header::on_signals_moved() update(); } +void Header::on_trace_changed() +{ + update(); + geometry_updated(); +} } // namespace view } // namespace pv