X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=802f897a607be89be0d1e6dfd684d65f61e75f57;hb=de0b46dec23da226e277638c75d8b65290f9167c;hp=e14a9f246ecfb39e7d390e9d9f96be136cdf80e9;hpb=38eeddeab105aea3f8015dda5399ebbead21550a;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index e14a9f24..802f897a 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -26,53 +26,69 @@ #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::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())); + + // 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->get_label_rect(0).width()); + } + } + + return QSize(max_width + Padding + BaselineOffset, 0); } shared_ptr Header::get_mouse_over_trace(const QPoint &pt) { - const int w = width(); + const int w = width() - BaselineOffset; const vector< shared_ptr > traces(_view.get_traces()); - const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) { assert(t); - - if (t->pt_in_label_rect(t->get_v_offset() - v_offset, - 0, w, pt)) + if (t->pt_in_label_rect(0, w, pt)) return t; } @@ -82,7 +98,7 @@ shared_ptr Header::get_mouse_over_trace(const QPoint &pt) void Header::clear_selection() { const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(const shared_ptr t, traces) { + for (const shared_ptr t : traces) { assert(t); t->select(false); } @@ -92,22 +108,23 @@ void Header::clear_selection() void Header::paintEvent(QPaintEvent*) { - const int w = width(); + // 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; const vector< shared_ptr > traces(_view.get_traces()); QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - const int v_offset = _view.v_offset(); const bool dragging = !_drag_traces.empty(); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) { assert(t); - const int y = t->get_v_offset() - v_offset; const bool highlight = !dragging && t->pt_in_label_rect( - y, 0, w, _mouse_point); - t->paint_label(painter, y, w, highlight); + 0, w, _mouse_point); + t->paint_label(painter, w, highlight); } painter.end(); @@ -123,7 +140,7 @@ void Header::mousePressEvent(QMouseEvent *event) _mouse_down_point = event->pos(); // Save the offsets of any signals which will be dragged - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) if (t->selected()) _drag_traces.push_back( make_pair(t, t->get_v_offset())); @@ -153,7 +170,7 @@ void Header::mousePressEvent(QMouseEvent *event) if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { // Unselect all other signals because the Ctrl is not // pressed - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) if (t != mouse_over_trace) t->select(false); } @@ -164,10 +181,29 @@ void Header::mousePressEvent(QMouseEvent *event) 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(); - _view.normalize_layout(); } } @@ -176,14 +212,22 @@ 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_traces.empty()) { + if (!_drag_traces.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); + 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 = @@ -214,52 +258,38 @@ void Header::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr t = get_mouse_over_trace(_mouse_point); - if (!t) - return; - - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); - - _context_trace = t; - menu.exec(event->globalPos()); - _context_trace.reset(); + if (t) + t->create_context_menu(this)->exec(event->globalPos()); } -void Header::on_action_set_name_triggered() +void Header::keyPressEvent(QKeyEvent *e) { - bool ok = false; + assert(e); - shared_ptr context_trace = _context_trace; - if (!context_trace) - return; - - const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_trace->get_name(), &ok); - - if (ok) - context_trace->set_name(new_label); -} - -void Header::on_action_set_colour_triggered() -{ - shared_ptr context_trace = _context_trace; - if (!context_trace) - return; - - const QColor new_colour = QColorDialog::getColor( - context_trace->get_colour(), this, tr("Set Colour")); - - if (new_colour.isValid()) - context_trace->set_colour(new_colour); + switch (e->key()) + { + case Qt::Key_Delete: + { + const vector< shared_ptr > traces(_view.get_traces()); + for (const shared_ptr t : traces) + if (t->selected()) + t->delete_pressed(); + break; + } + } } void Header::on_signals_changed() { const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); - connect(t.get(), SIGNAL(text_changed()), this, SLOT(update())); + 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())); } } @@ -268,6 +298,11 @@ void Header::on_signals_moved() update(); } +void Header::on_trace_changed() +{ + update(); + geometry_updated(); +} } // namespace view } // namespace pv