X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e084ecc94e55fe4a7390a0bc3f76aae2002e63e7;hb=6e3f046e779b939efebdfa4d9e68fe28d9beee59;hp=976172137987e3780382a50a75e0eced462a2be7;hpb=491536836d878a3abf7959800f56641ac093bd11;p=pulseview.git diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 97617213..e084ecc9 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -29,8 +29,6 @@ #include #include -#include -#include #include #include #include @@ -43,62 +41,59 @@ namespace pv { namespace view { 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) { 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) +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(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(); - 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); - s->paint_label(painter, signal_heading_rect, - s->pt_in_label_rect(signal_heading_rect, _mouse_point)); + const bool highlight = !dragging && t->pt_in_label_rect( + 0, w, _mouse_point); + t->paint_label(painter, w, highlight); } painter.end(); @@ -108,39 +103,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(~QApplication::keyboardModifiers() & Qt::ControlModifier) { - // Unselect all other signals because the Ctrl is not - // pressed - BOOST_FOREACH(const shared_ptr s, sigs) - s->select(false); + 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 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) - mouse_over_signal->select(!mouse_over_signal->selected()); - - if(event->button() & Qt::LeftButton) { - _mouse_down_point = event->pos(); + 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_trace->select(true); + + if (~QApplication::keyboardModifiers() & + Qt::ControlModifier) + _drag_traces.clear(); + + // Add the signal to the drag list + if (event->button() & Qt::LeftButton) + _drag_traces.push_back( + make_pair(mouse_over_trace, + mouse_over_trace->get_v_offset())); + } + } - // Save the current signal offsets - BOOST_FOREACH(const shared_ptr s, sigs) - _mouse_down_signal_offsets[s.get()] = - s->get_v_offset(); + if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { + // Unselect all other signals because the Ctrl is not + // pressed + 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) - _mouse_down_signal_offsets.clear(); + if (event->button() == Qt::LeftButton) { + _drag_traces.clear(); + _view.normalize_layout(); + } } void Header::mouseMoveEvent(QMouseEvent *event) @@ -149,22 +163,26 @@ void Header::mouseMoveEvent(QMouseEvent *event) _mouse_point = event->pos(); // Move the signals if we are dragging - if(!_mouse_down_signal_offsets.empty()) { - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + if (!_drag_traces.empty()) { const int delta = event->pos().y() - _mouse_down_point.y(); - BOOST_FOREACH(const shared_ptr s, sigs) - if(s->selected()) { - const int y = - _mouse_down_signal_offsets[s.get()] + - delta; + 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; - s->set_v_offset(y_snap ); + trace->set_v_offset(y_snap); + + // Ensure the trace is selected + trace->select(); } + + } signals_moved(); } @@ -172,7 +190,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update(); @@ -180,45 +198,26 @@ 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) - return; - - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); - - _context_signal = s; - menu.exec(event->globalPos()); - _context_signal.reset(); + if (t) + t->create_context_menu(this)->exec(event->globalPos()); } -void Header::on_action_set_name_triggered() +void Header::on_signals_changed() { - 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()); - - if(!new_label.isEmpty()) - context_signal->set_name(new_label); + 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_action_set_colour_triggered() +void Header::on_signals_moved() { - shared_ptr context_signal = _context_signal; - if(!context_signal) - return; - - const QColor new_colour = QColorDialog::getColor( - context_signal->get_colour(), this, tr("Set Colour")); - - if(new_colour.isValid()) - context_signal->set_colour(new_colour); + update(); } + } // namespace view } // namespace pv