X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=a141b6164754f79760fc27c291d0054b48245da6;hp=284bb37284cfe7e1a49ce6b11d8662f28d387df8;hb=fdf5ff04d8687ac67767267e9b440a2b5d37defd;hpb=b3b57abc4fcfea1471529e9d116eaf11905f6639

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 284bb372..a141b616 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -21,13 +21,14 @@
 #include "header.h"
 #include "view.h"
 
-#include "../signal.h"
+#include "signal.h"
 #include "../sigsession.h"
 
 #include <assert.h>
 
 #include <boost/foreach.hpp>
 
+#include <QApplication>
 #include <QColorDialog>
 #include <QInputDialog>
 #include <QMenu>
@@ -55,6 +56,29 @@ Header::Header(View &parent) :
 		this, SLOT(on_action_set_colour_triggered()));
 }
 
+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 int v_offset = _view.v_offset();
+	BOOST_FOREACH(const shared_ptr<Signal> 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<Signal>();
+}
+
 void Header::paintEvent(QPaintEvent *event)
 {
 	const int w = width();
@@ -64,27 +88,105 @@ 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<Signal> s, sigs)
 	{
 		assert(s);
 
 		const QRect signal_heading_rect(
-			0, offset, w, View::SignalHeight);
-
-		s->paint_label(painter, signal_heading_rect,
-			s->pt_in_label_rect(signal_heading_rect, _mouse_point));
+			0, s->get_v_offset() - v_offset,
+			w, View::SignalHeight);
 
-		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<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);
+	}
+
+	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())
+				_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) {
+		if(mouse_over_signal->selected())
+			mouse_over_signal->select(false);
+		else {
+			mouse_over_signal->select(true);
+
+			// Add the signal to the drag list
+			_drag_sigs.push_back(
+				make_pair(mouse_over_signal,
+					mouse_over_signal->get_v_offset()));
+		}
+	}
+
+	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<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();
+	}
+
 	update();
 }
 
@@ -96,37 +198,23 @@ void Header::leaveEvent(QEvent *event)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
-
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
+	const shared_ptr<Signal> 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);
-			menu.addAction(_action_set_colour);
-
-			_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<Signal> context_signal = _context_signal;
+	shared_ptr<view::Signal> context_signal = _context_signal;
 	if(!context_signal)
 		return;
 
@@ -139,7 +227,7 @@ void Header::on_action_set_name_triggered()
 
 void Header::on_action_set_colour_triggered()
 {
-	boost::shared_ptr<Signal> context_signal = _context_signal;
+	shared_ptr<view::Signal> context_signal = _context_signal;
 	if(!context_signal)
 		return;