X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=8fb5b4bd3c126a104b2f37d133ceb65405ddb380;hp=976172137987e3780382a50a75e0eced462a2be7;hb=c23b29d67ed68c1a899000bf0049056fe9f51a62;hpb=491536836d878a3abf7959800f56641ac093bd11 diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 97617213..8fb5b4bd 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)) { @@ -54,51 +53,50 @@ Header::Header(View &parent) : this, SLOT(on_action_set_name_triggered())); connect(_action_set_colour, SIGNAL(triggered()), this, SLOT(on_action_set_colour_triggered())); + + connect(&_view, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); } boost::shared_ptr Header::get_mouse_over_signal( const QPoint &pt) { const int w = width(); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > sigs( + _view.session().get_signals()); const int v_offset = _view.v_offset(); BOOST_FOREACH(const shared_ptr s, sigs) { assert(s); - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); - - if(s->pt_in_label_rect(signal_heading_rect, pt)) + if (s->pt_in_label_rect(s->get_v_offset() - v_offset, + 0, w, pt)) return s; } return shared_ptr(); } -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 > sigs( + _view.session().get_signals()); 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) { assert(s); - const QRect signal_heading_rect( - 0, s->get_v_offset() - v_offset, - w, View::SignalHeight); - - s->paint_label(painter, signal_heading_rect, - s->pt_in_label_rect(signal_heading_rect, _mouse_point)); + const int y = s->get_v_offset() - v_offset; + const bool highlight = !dragging && s->pt_in_label_rect( + y, 0, w, _mouse_point); + s->paint_label(painter, y, w, highlight); } painter.end(); @@ -108,29 +106,46 @@ void Header::mousePressEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); + const vector< shared_ptr > sigs( + _view.session().get_signals()); - if(~QApplication::keyboardModifiers() & Qt::ControlModifier) { - // Unselect all other signals because the Ctrl is not - // pressed + 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) - s->select(false); + if (s->selected()) + _drag_sigs.push_back( + make_pair(s, s->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(); + if (mouse_over_signal) { + if (mouse_over_signal->selected()) + mouse_over_signal->select(false); + else { + mouse_over_signal->select(true); + + if (~QApplication::keyboardModifiers() & + Qt::ControlModifier) + _drag_sigs.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())); + } + } - // Save the current signal offsets + if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { + // Unselect all other signals because the Ctrl is not + // pressed BOOST_FOREACH(const shared_ptr s, sigs) - _mouse_down_signal_offsets[s.get()] = - s->get_v_offset(); + if (s != mouse_over_signal) + s->select(false); } update(); @@ -139,8 +154,10 @@ void Header::mousePressEvent(QMouseEvent *event) void Header::mouseReleaseEvent(QMouseEvent *event) { assert(event); - if(event->button() == Qt::LeftButton) - _mouse_down_signal_offsets.clear(); + if (event->button() == Qt::LeftButton) { + _drag_sigs.clear(); + _view.normalize_layout(); + } } void Header::mouseMoveEvent(QMouseEvent *event) @@ -149,22 +166,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_sigs.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_sigs.begin(); + i != _drag_sigs.end(); i++) { + const boost::shared_ptr sig((*i).first); + if (sig) { + const int y = (*i).second + delta; const int y_snap = ((y + View::SignalSnapGridSize / 2) / View::SignalSnapGridSize) * View::SignalSnapGridSize; - s->set_v_offset(y_snap ); + sig->set_v_offset(y_snap); + + // Ensure the signal is selected + sig->select(); } + + } signals_moved(); } @@ -172,7 +193,7 @@ void Header::mouseMoveEvent(QMouseEvent *event) update(); } -void Header::leaveEvent(QEvent *event) +void Header::leaveEvent(QEvent*) { _mouse_point = QPoint(-1, -1); update(); @@ -182,7 +203,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr s = get_mouse_over_signal(_mouse_point); - if(!s) + if (!s) return; QMenu menu(this); @@ -196,29 +217,37 @@ void Header::contextMenuEvent(QContextMenuEvent *event) void Header::on_action_set_name_triggered() { + bool ok = false; + shared_ptr context_signal = _context_signal; - if(!context_signal) + if (!context_signal) return; const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_signal->get_name()); + tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok); - if(!new_label.isEmpty()) + if (ok) context_signal->set_name(new_label); } void Header::on_action_set_colour_triggered() { shared_ptr context_signal = _context_signal; - if(!context_signal) + if (!context_signal) return; const QColor new_colour = QColorDialog::getColor( context_signal->get_colour(), this, tr("Set Colour")); - if(new_colour.isValid()) + if (new_colour.isValid()) context_signal->set_colour(new_colour); } +void Header::on_signals_moved() +{ + update(); +} + + } // namespace view } // namespace pv