X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=514a3e49694e348dc08123749da90ff0290d1f67;hp=125d3c2430ba868d95c0f535e162d9279dda9e90;hb=4f82e4f613aced3594f07fa219a9d8c247eaed11;hpb=2e57535108a0ae2e5d1ee454f1e61b71d23afdb3

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 125d3c24..514a3e49 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -24,128 +24,283 @@
 #include "signal.h"
 #include "../sigsession.h"
 
-#include <assert.h>
+#include <cassert>
+#include <algorithm>
 
-#include <boost/foreach.hpp>
-
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 
-using namespace boost;
-using namespace std;
+#include <pv/widgets/popup.h>
+
+using std::max;
+using std::make_pair;
+using std::pair;
+using std::shared_ptr;
+using std::stable_sort;
+using std::vector;
 
 namespace pv {
 namespace view {
 
+const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
+
 Header::Header(View &parent) :
-	QWidget(&parent),
-	_view(parent),
-	_action_set_name(new QAction(tr("Set &Name..."), this)),
-	_action_set_colour(new QAction(tr("Set &Colour..."), this))
+	MarginWidget(parent),
+	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	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()));
+}
+
+QSize Header::sizeHint() const
+{
+	QRectF max_rect(-Padding, 0, Padding, 0);
+	for (auto &i : _view)
+		if (i->enabled())
+			max_rect = max_rect.united(i->label_rect(0));
+	return QSize(max_rect.width() + Padding + BaselineOffset, 0);
+}
+
+shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+{
+	const int w = width() - BaselineOffset;
+	for (auto &i : _view)
+		if (i->enabled() && i->label_rect(w).contains(pt))
+			return i;
+	return shared_ptr<RowItem>();
+}
+
+void Header::clear_selection()
+{
+	for (auto &i : _view)
+		i->select(false);
+	update();
+}
+
+void Header::signals_updated()
+{
+	for (shared_ptr<RowItem> r : _view) {
+		assert(r);
+		connect(r.get(), SIGNAL(appearance_changed()),
+			this, SLOT(on_trace_changed()));
+	}
+}
+
+void Header::show_popup(const shared_ptr<RowItem> &item)
+{
+	using pv::widgets::Popup;
+
+	Popup *const p = item->create_popup(&_view);
+	if (!p)
+		return;
+
+	const QPoint pt(width() - BaselineOffset, item->get_y());
+	p->set_position(mapToGlobal(pt), Popup::Right);
+	p->show();
 }
 
-void Header::paintEvent(QPaintEvent *event)
+void Header::paintEvent(QPaintEvent*)
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	// The trace labels are not drawn with the arrows exactly on the
+	// left edge of the widget, because then the selection shadow
+	// would be clipped away.
+	const int w = width() - BaselineOffset;
+
+	vector< shared_ptr<RowItem> > row_items(
+		_view.begin(), _view.end());
+
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->v_offset() < b->v_offset(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(s);
-
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
+		assert(r);
 
-		s->paint_label(painter, signal_heading_rect,
-			s->pt_in_label_rect(signal_heading_rect, _mouse_point));
+		const bool highlight = !_dragging &&
+			r->label_rect(w).contains(_mouse_point);
+		r->paint_label(painter, w, highlight);
 	}
 
 	painter.end();
 }
 
-void Header::mouseMoveEvent(QMouseEvent *event)
+void Header::mouseLeftPressEvent(QMouseEvent *event)
 {
-	assert(event);
-	_mouse_point = event->pos();
+	(void)event;
+
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+	// Clear selection if control is not pressed and this item is unselected
+	if ((!_mouse_down_item || !_mouse_down_item->selected()) &&
+		!ctrl_pressed)
+		for (shared_ptr<RowItem> r : _view)
+			r->select(false);
+
+	// Set the signal selection state if the item has been clicked
+	if (_mouse_down_item) {
+		if (ctrl_pressed)
+			_mouse_down_item->select(!_mouse_down_item->selected());
+		else
+			_mouse_down_item->select(true);
+	}
+
+	// Save the offsets of any signals which will be dragged
+	for (const shared_ptr<RowItem> r : _view)
+		if (r->selected())
+			r->drag();
+
+	selection_changed();
 	update();
 }
 
-void Header::leaveEvent(QEvent *event)
+void Header::mousePressEvent(QMouseEvent *event)
 {
-	_mouse_point = QPoint(-1, -1);
-	update();
+	assert(event);
+
+	_mouse_down_point = event->pos();
+	_mouse_down_item = get_mouse_over_row_item(event->pos());
+
+	if (event->button() & Qt::LeftButton)
+		mouseLeftPressEvent(event);
 }
 
-void Header::contextMenuEvent(QContextMenuEvent *event)
+void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	assert(event);
 
-	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
+	// Unselect everything if control is not pressed
+	const shared_ptr<RowItem> mouse_over =
+		get_mouse_over_row_item(event->pos());
 
-		if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
-			QMenu menu(this);
-			menu.addAction(_action_set_name);
-			menu.addAction(_action_set_colour);
+	for (auto &r : _view)
+		r->drag_release();
 
-			_context_signal = s;
-			menu.exec(event->globalPos());
-			_context_signal.reset();
+	if (!_dragging)
+	{
+		if (!ctrl_pressed) {
+			for (shared_ptr<RowItem> r : _view)
+				if (_mouse_down_item != r)
+					r->select(false);
 
-			break;
+			if (_mouse_down_item)
+				show_popup(_mouse_down_item);
 		}
 	}
+
+	_dragging = false;
 }
 
-void Header::on_action_set_name_triggered()
+void Header::mouseReleaseEvent(QMouseEvent *event)
 {
-	shared_ptr<view::Signal> context_signal = _context_signal;
-	if(!context_signal)
+	assert(event);
+	if (event->button() & Qt::LeftButton)
+		mouseLeftReleaseEvent(event);
+
+	_mouse_down_item = nullptr;
+}
+
+void Header::mouseMoveEvent(QMouseEvent *event)
+{
+	assert(event);
+	_mouse_point = event->pos();
+
+	if (!(event->buttons() & Qt::LeftButton))
+		return;
+
+	if ((event->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
 		return;
 
-	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_signal->get_name());
+	// Check all the drag items share a common owner
+	RowItemOwner *item_owner = nullptr;
+	for (shared_ptr<RowItem> r : _view)
+		if (r->dragging()) {
+			if (!item_owner)
+				item_owner = r->owner();
+			else if(item_owner != r->owner())
+				return;
+		}
+
+	if (!item_owner)
+		return;
+
+	// Do the drag
+	_dragging = true;
+
+	const int delta = event->pos().y() - _mouse_down_point.y();
+
+	for (std::shared_ptr<RowItem> r : _view)
+		if (r->dragging()) {
+			r->set_v_offset(r->drag_point().y() + delta);
+
+			// Ensure the trace is selected
+			r->select();
+		}
+
+	signals_moved();
+
+	update();
+}
 
-	if(!new_label.isEmpty())
-		context_signal->set_name(new_label);
+void Header::leaveEvent(QEvent*)
+{
+	_mouse_point = QPoint(-1, -1);
+	update();
 }
 
-void Header::on_action_set_colour_triggered()
+void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	shared_ptr<view::Signal> context_signal = _context_signal;
-	if(!context_signal)
+	const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+	if (!r)
 		return;
 
-	const QColor new_colour = QColorDialog::getColor(
-		context_signal->get_colour(), this, tr("Set Colour"));
+	QMenu *const menu = r->create_context_menu(this);
+	if (!menu)
+		return;
+
+	menu->exec(event->globalPos());
+}
+
+void Header::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
+
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		for (const shared_ptr<RowItem> r : _view)
+			if (r->selected())
+				r->delete_pressed();
+		break;
+	}
+	}
+}
 
-	if(new_colour.isValid())
-		context_signal->set_colour(new_colour);
+void Header::on_signals_moved()
+{
+	update();
+}
+
+void Header::on_trace_changed()
+{
+	update();
+	geometry_updated();
 }
 
 } // namespace view