X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e167bffc5c8e38535e82d94692bf96a8193de8f2;hp=1c7903dbc372d38d55366b771c49fe3854de9bdf;hb=0720481923d46cde06148c8a4aec2f96def66643;hpb=49f8ff3fd225c72934eca725eacffb12b6542ebf diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 1c7903db..e167bffc 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -21,13 +21,15 @@ #include "header.h" #include "view.h" -#include "../signal.h" +#include "signal.h" #include "../sigsession.h" #include #include +#include +#include #include #include #include @@ -43,12 +45,41 @@ namespace view { Header::Header(View &parent) : QWidget(&parent), _view(parent), - _action_set_name(new QAction(tr("Set &Name..."), this)) + _action_set_name(new QAction(tr("Set &Name..."), this)), + _action_set_colour(new QAction(tr("Set &Colour..."), this)) { 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, 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 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)) + return s; + } + + return shared_ptr(); } void Header::paintEvent(QPaintEvent *event) @@ -60,27 +91,110 @@ void Header::paintEvent(QPaintEvent *event) QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - int offset = -_view.v_offset(); + 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, offset, w, View::SignalHeight); + 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)); - - offset += View::SignalHeight; + const bool highlight = !dragging && s->pt_in_label_rect( + signal_heading_rect, _mouse_point); + s->paint_label(painter, signal_heading_rect, highlight); } painter.end(); } +void Header::mousePressEvent(QMouseEvent *event) +{ + assert(event); + + const vector< shared_ptr > &sigs = + _view.session().get_signals(); + + 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())); + } + + // 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); + 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())); + } + } + + 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); + } + + update(); +} + +void Header::mouseReleaseEvent(QMouseEvent *event) +{ + assert(event); + if(event->button() == Qt::LeftButton) + _drag_sigs.clear(); +} + void Header::mouseMoveEvent(QMouseEvent *event) { assert(event); _mouse_point = event->pos(); + + // Move the signals if we are dragging + if(!_drag_sigs.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) { + const int y = (*i).second + delta; + const int y_snap = + ((y + View::SignalSnapGridSize / 2) / + View::SignalSnapGridSize) * + View::SignalSnapGridSize; + sig->set_v_offset(y_snap); + + // Ensure the signal is selected + sig->select(); + } + + } + + signals_moved(); + } + update(); } @@ -92,36 +206,23 @@ void Header::leaveEvent(QEvent *event) void Header::contextMenuEvent(QContextMenuEvent *event) { - const int w = width(); - const vector< shared_ptr > &sigs = - _view.session().get_signals(); - - int offset = -_view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); + const shared_ptr s = get_mouse_over_signal(_mouse_point); - const QRect signal_heading_rect( - 0, offset, w, View::SignalHeight); - - if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) { - QMenu menu(this); - menu.addAction(_action_set_name); - - _context_signal = s; - menu.exec(event->globalPos()); - _context_signal.reset(); + if(!s) + return; - break; - } + QMenu menu(this); + menu.addAction(_action_set_name); + menu.addAction(_action_set_colour); - offset += View::SignalHeight; - } + _context_signal = s; + menu.exec(event->globalPos()); + _context_signal.reset(); } void Header::on_action_set_name_triggered() { - boost::shared_ptr context_signal = _context_signal; + shared_ptr context_signal = _context_signal; if(!context_signal) return; @@ -132,5 +233,24 @@ void Header::on_action_set_name_triggered() context_signal->set_name(new_label); } +void Header::on_action_set_colour_triggered() +{ + 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); +} + +void Header::on_signals_moved() +{ + update(); +} + + } // namespace view } // namespace pv