Mutex protected SigSession::_signals

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 00c4201cf39a28d0ee3e234b0f311e6838ab1a5b..5f1de744a1d7e5642d6f364f66672f1020aa7a12 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -54,14 +54,17 @@ 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<pv::view::Signal> Header::get_mouse_over_signal(
        const QPoint &pt)
 {
        const int w = width();
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
 
        const int v_offset = _view.v_offset();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -82,13 +85,14 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
 void Header::paintEvent(QPaintEvent *event)
 {
        const int w = width();
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Signal> > 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<Signal> s, sigs)
        {
                assert(s);
@@ -97,8 +101,9 @@ void Header::paintEvent(QPaintEvent *event)
                        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 bool highlight = !dragging && s->pt_in_label_rect(
+                       signal_heading_rect, _mouse_point);
+               s->paint_label(painter, signal_heading_rect, highlight);
        }
 
        painter.end();
@@ -108,29 +113,46 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
 
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Signal> > 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<Signal> 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<Signal> 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<Signal> s, sigs)
-                       _mouse_down_signal_offsets[s.get()] =
-                               s->get_v_offset();
+                       if(s != mouse_over_signal)
+                               s->select(false);
        }
 
        update();
@@ -139,8 +161,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,16 +173,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<Signal> > &sigs =
-                       _view.session().get_signals();
+       if(!_drag_sigs.empty()) {
                const int delta = event->pos().y() - _mouse_down_point.y();
 
-               BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-                       if(s->selected())
-                               s->set_v_offset(
-                                       _mouse_down_signal_offsets[s.get()] +
-                                       delta);
+               for(std::list<std::pair<boost::weak_ptr<Signal>,
+                       int> >::iterator i = _drag_sigs.begin();
+                       i != _drag_sigs.end(); i++) {
+                       const boost::shared_ptr<Signal> 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();
        }
@@ -214,5 +248,11 @@ void Header::on_action_set_colour_triggered()
                context_signal->set_colour(new_colour);
 }
 
+void Header::on_signals_moved()
+{
+       update();
+}
+
+
 } // namespace view
 } // namespace pv