Some smaller whitespace fixes.

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e50d851f686d315bc584f5e92510218b85f3ad08..63679012a52947d92b7d1fc67f40948a042f339b 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)
@@ -72,7 +75,7 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
                        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(signal_heading_rect, pt))
                        return s;
        }
 
@@ -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,23 +113,15 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
 
-       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
-               _drag_sigs.clear();
-               BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-                       s->select(false);
-       }
+       const vector< shared_ptr<Signal> > sigs(
+               _view.session().get_signals());
 
-       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<Signal> s, sigs)
-                       if(s->selected())
+                       if (s->selected())
                                _drag_sigs.push_back(
                                        make_pair(s, s->get_v_offset()));
        }
@@ -132,27 +129,42 @@ void Header::mousePressEvent(QMouseEvent *event)
        // 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) {
-               if(mouse_over_signal->selected())
+       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
-                       _drag_sigs.push_back(
-                               make_pair(mouse_over_signal,
+                       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<Signal> s, sigs)
+                       if (s != mouse_over_signal)
+                               s->select(false);
+       }
+
        update();
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
        assert(event);
-       if(event->button() == Qt::LeftButton)
+       if (event->button() == Qt::LeftButton) {
                _drag_sigs.clear();
+               _view.normalize_layout();
+       }
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
@@ -161,14 +173,14 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        _mouse_point = event->pos();
 
        // Move the signals if we are dragging
-       if(!_drag_sigs.empty()) {
+       if (!_drag_sigs.empty()) {
                const int delta = event->pos().y() - _mouse_down_point.y();
 
-               for(std::list<std::pair<boost::weak_ptr<Signal>,
+               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) {
+                       if (sig) {
                                const int y = (*i).second + delta;
                                const int y_snap =
                                        ((y + View::SignalSnapGridSize / 2) /
@@ -198,7 +210,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 {
        const shared_ptr<Signal> s = get_mouse_over_signal(_mouse_point);
 
-       if(!s)
+       if (!s)
                return;
 
        QMenu menu(this);
@@ -213,28 +225,34 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 void Header::on_action_set_name_triggered()
 {
        shared_ptr<view::Signal> 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());
 
-       if(!new_label.isEmpty())
+       if (!new_label.isEmpty())
                context_signal->set_name(new_label);
 }
 
 void Header::on_action_set_colour_triggered()
 {
        shared_ptr<view::Signal> 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