X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=5e978a70252565cf47f4a3bb95712707a813842d;hp=a141b6164754f79760fc27c291d0054b48245da6;hb=68b21a71797051fb48ed272bc2a6b4893bdbf517;hpb=fdf5ff04d8687ac67767267e9b440a2b5d37defd diff --git a/pv/view/header.cpp b/pv/view/header.cpp index a141b616..5e978a70 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -24,83 +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) : - 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.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 > 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); } -boost::shared_ptr Header::get_mouse_over_signal( - const QPoint &pt) +shared_ptr Header::get_mouse_over_row_item(const QPoint &pt) { - const int w = width(); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const int w = width() - BaselineOffset; + const vector< shared_ptr > row_items(_view.child_items()); - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + for (const shared_ptr r : row_items) { - assert(s); + assert(r); + if (r->enabled() && r->label_rect(w).contains(pt)) + return r; + } - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); + return shared_ptr(); +} - if(s->pt_in_label_rect(signal_heading_rect, pt)) - return s; +void Header::clear_selection() +{ + const vector< shared_ptr > row_items(_view.child_items()); + for (const shared_ptr r : row_items) { + assert(r); + r->select(false); } - return shared_ptr(); + update(); } -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.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 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 QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); - - 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(); @@ -110,51 +140,77 @@ void Header::mousePressEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); - - if(~QApplication::keyboardModifiers() & Qt::ControlModifier) { - // Unselect all other signals because the Ctrl is not - // pressed - _drag_sigs.clear(); - BOOST_FOREACH(const shared_ptr s, sigs) - s->select(false); - } + const vector< shared_ptr > row_items(_view.child_items()); - if(event->button() & Qt::LeftButton) { + 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 : 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_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_row_items.clear(); // Add the signal to the drag list - _drag_sigs.push_back( - make_pair(mouse_over_signal, - mouse_over_signal->get_v_offset())); + if (event->button() & Qt::LeftButton) + _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 + for (const shared_ptr r : row_items) + if (r != mouse_over_row_item) + r->select(false); + } + + selection_changed(); update(); } void Header::mouseReleaseEvent(QMouseEvent *event) { + using pv::widgets::Popup; + assert(event); - if(event->button() == Qt::LeftButton) - _drag_sigs.clear(); + if (event->button() == Qt::LeftButton) { + 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) { + const int w = width() - BaselineOffset; + Popup *const p = + 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_row_items.clear(); + } } void Header::mouseMoveEvent(QMouseEvent *event) @@ -162,24 +218,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(); } } @@ -190,7 +255,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update(); @@ -198,44 +263,52 @@ void Header::leaveEvent(QEvent *event) void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr s = get_mouse_over_signal(_mouse_point); - - if(!s) - return; - - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); + const shared_ptr r = get_mouse_over_row_item(_mouse_point); - _context_signal = s; - menu.exec(event->globalPos()); - _context_signal.reset(); + if (r) + r->create_context_menu(this)->exec(event->globalPos()); } -void Header::on_action_set_name_triggered() +void Header::keyPressEvent(QKeyEvent *e) { - shared_ptr context_signal = _context_signal; - if(!context_signal) - return; - - const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_signal->get_name()); + assert(e); - if(!new_label.isEmpty()) - context_signal->set_name(new_label); + 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_action_set_colour_triggered() +void Header::on_signals_changed() { - shared_ptr context_signal = _context_signal; - if(!context_signal) - return; + 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())); + } +} - const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); +void Header::on_signals_moved() +{ + update(); +} - if(new_colour.isValid()) - context_signal->set_colour(new_colour); +void Header::on_trace_changed() +{ + update(); + geometry_updated(); } } // namespace view