X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=653cac483bc0d36ec37b4c57b01f168cf5f3f586;hb=1ef49ddd04f44a4369403fbab19ed235483e2975;hp=af67abddd899f401b01eeb3d8665e271f959547c;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index af67abdd..653cac48 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -26,8 +26,6 @@ #include -#include - #include #include #include @@ -36,16 +34,17 @@ #include -using boost::shared_ptr; 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), @@ -59,6 +58,10 @@ 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 @@ -66,23 +69,26 @@ QSize Header::sizeHint() const int max_width = 0; const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); - max_width = max(max_width, (int)t->get_label_rect(0).width()); + + if (t->enabled()) { + max_width = max(max_width, (int)t->label_rect(0).width()); + } } - return QSize(max_width + Padding, 0); + 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()); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) { assert(t); - if (t->pt_in_label_rect(0, w, pt)) + if (t->enabled() && t->label_rect(w).contains(pt)) return t; } @@ -92,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); } @@ -102,19 +108,22 @@ 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 bool dragging = !_drag_traces.empty(); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) { assert(t); - const bool highlight = !dragging && t->pt_in_label_rect( - 0, w, _mouse_point); + const bool highlight = !dragging && + t->label_rect(w).contains(_mouse_point); t->paint_label(painter, w, highlight); } @@ -131,10 +140,10 @@ 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())); + make_pair(t, t->v_offset())); } // Select the signal if it has been clicked @@ -154,14 +163,14 @@ void Header::mousePressEvent(QMouseEvent *event) if (event->button() & Qt::LeftButton) _drag_traces.push_back( make_pair(mouse_over_trace, - mouse_over_trace->get_v_offset())); + mouse_over_trace->v_offset())); } } 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); } @@ -183,9 +192,10 @@ void Header::mouseReleaseEvent(QMouseEvent *event) 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(width(), + p->set_position(mapToGlobal(QPoint(w, mouse_over_trace->get_y())), Popup::Right); p->show(); @@ -216,10 +226,8 @@ void Header::mouseMoveEvent(QMouseEvent *event) 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 = @@ -263,7 +271,7 @@ void Header::keyPressEvent(QKeyEvent *e) case Qt::Key_Delete: { const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) if (t->selected()) t->delete_pressed(); break; @@ -274,12 +282,12 @@ void Header::keyPressEvent(QKeyEvent *e) 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(visibility_changed()), - this, SLOT(update())); + this, SLOT(on_trace_changed())); connect(t.get(), SIGNAL(text_changed()), - this, SLOT(on_trace_text_changed())); + this, SLOT(on_trace_changed())); connect(t.get(), SIGNAL(colour_changed()), this, SLOT(update())); } @@ -290,7 +298,7 @@ void Header::on_signals_moved() update(); } -void Header::on_trace_text_changed() +void Header::on_trace_changed() { update(); geometry_updated();