X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=744e4aff06b2072006c68fe4880b973f195e05d7;hp=00c4201cf39a28d0ee3e234b0f311e6838ab1a5b;hb=4b192962559bb212408a94f48a9a8efead024aa7;hpb=54401bbb93fbbd9b0de4874bf02c24b710643fe7

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 00c4201c..744e4aff 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -54,6 +54,9 @@ 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(
@@ -89,6 +92,7 @@ void Header::paintEvent(QPaintEvent *event)
 	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();
@@ -111,26 +116,43 @@ void Header::mousePressEvent(QMouseEvent *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
+	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