X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e14a9f246ecfb39e7d390e9d9f96be136cdf80e9;hp=e167bffc5c8e38535e82d94692bf96a8193de8f2;hb=38eeddeab105aea3f8015dda5399ebbead21550a;hpb=0720481923d46cde06148c8a4aec2f96def66643 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index e167bffc..e14a9f24 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -43,8 +43,7 @@ namespace pv { namespace view { Header::Header(View &parent) : - QWidget(&parent), - _view(parent), + MarginWidget(parent), _action_set_name(new QAction(tr("Set &Name..."), this)), _action_set_colour(new QAction(tr("Set &Colour..."), this)) { @@ -55,55 +54,60 @@ Header::Header(View &parent) : 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) +shared_ptr Header::get_mouse_over_trace(const QPoint &pt) { const int w = width(); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > traces(_view.get_traces()); const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const shared_ptr t, traces) { - assert(s); + assert(t); + + if (t->pt_in_label_rect(t->get_v_offset() - v_offset, + 0, w, pt)) + return t; + } - 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 > traces(_view.get_traces()); + BOOST_FOREACH(const shared_ptr t, traces) { + assert(t); + t->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(); + 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_sigs.empty(); - BOOST_FOREACH(const shared_ptr s, sigs) + const bool dragging = !_drag_traces.empty(); + BOOST_FOREACH(const shared_ptr t, traces) { - assert(s); - - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); + assert(t); - const bool highlight = !dragging && s->pt_in_label_rect( - signal_heading_rect, _mouse_point); - s->paint_label(painter, signal_heading_rect, highlight); + 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); } painter.end(); @@ -113,56 +117,58 @@ void Header::mousePressEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > traces(_view.get_traces()); - 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())); + BOOST_FOREACH(const shared_ptr t, traces) + if (t->selected()) + _drag_traces.push_back( + make_pair(t, t->get_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_trace = + get_mouse_over_trace(event->pos()); + if (mouse_over_trace) { + if (mouse_over_trace->selected()) + mouse_over_trace->select(false); else { - mouse_over_signal->select(true); + mouse_over_trace->select(true); - if(~QApplication::keyboardModifiers() & + if (~QApplication::keyboardModifiers() & Qt::ControlModifier) - _drag_sigs.clear(); + _drag_traces.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())); + if (event->button() & Qt::LeftButton) + _drag_traces.push_back( + make_pair(mouse_over_trace, + mouse_over_trace->get_v_offset())); } } - if(~QApplication::keyboardModifiers() & Qt::ControlModifier) { + 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); + BOOST_FOREACH(const shared_ptr t, traces) + if (t != mouse_over_trace) + t->select(false); } + selection_changed(); update(); } void Header::mouseReleaseEvent(QMouseEvent *event) { assert(event); - if(event->button() == Qt::LeftButton) - _drag_sigs.clear(); + if (event->button() == Qt::LeftButton) { + _drag_traces.clear(); + _view.normalize_layout(); + } } void Header::mouseMoveEvent(QMouseEvent *event) @@ -171,23 +177,23 @@ void Header::mouseMoveEvent(QMouseEvent *event) _mouse_point = event->pos(); // Move the signals if we are dragging - if(!_drag_sigs.empty()) { + if (!_drag_traces.empty()) { 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 (std::list, + int> >::iterator i = _drag_traces.begin(); + i != _drag_traces.end(); i++) { + const boost::shared_ptr trace((*i).first); + if (trace) { const int y = (*i).second + delta; const int y_snap = ((y + View::SignalSnapGridSize / 2) / View::SignalSnapGridSize) * View::SignalSnapGridSize; - sig->set_v_offset(y_snap); + trace->set_v_offset(y_snap); - // Ensure the signal is selected - sig->select(); + // Ensure the trace is selected + trace->select(); } } @@ -198,7 +204,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update(); @@ -206,44 +212,55 @@ void Header::leaveEvent(QEvent *event) void Header::contextMenuEvent(QContextMenuEvent *event) { - const shared_ptr s = get_mouse_over_signal(_mouse_point); + const shared_ptr t = get_mouse_over_trace(_mouse_point); - if(!s) + if (!t) return; QMenu menu(this); menu.addAction(_action_set_name); menu.addAction(_action_set_colour); - _context_signal = s; + _context_trace = t; menu.exec(event->globalPos()); - _context_signal.reset(); + _context_trace.reset(); } void Header::on_action_set_name_triggered() { - shared_ptr context_signal = _context_signal; - if(!context_signal) + bool ok = false; + + 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_signal->get_name()); + tr("Name"), QLineEdit::Normal, context_trace->get_name(), &ok); - if(!new_label.isEmpty()) - context_signal->set_name(new_label); + if (ok) + context_trace->set_name(new_label); } void Header::on_action_set_colour_triggered() { - shared_ptr context_signal = _context_signal; - if(!context_signal) + shared_ptr context_trace = _context_trace; + if (!context_trace) return; const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); + context_trace->get_colour(), this, tr("Set Colour")); + + if (new_colour.isValid()) + context_trace->set_colour(new_colour); +} - if(new_colour.isValid()) - context_signal->set_colour(new_colour); +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())); + } } void Header::on_signals_moved()