X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=b9261f9753d060bdaffbb48ab7c52a35d4a5210b;hp=549b71918627b4bd1a6d0e01f2e20f6fe17994f6;hb=0dda6fe595932b2e340930104fad8ac4fc574895;hpb=728fcafc9897d3ffb4a109b6248d88b0945128f5

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 549b7191..b9261f97 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -24,9 +24,8 @@
 #include "signal.h"
 #include "../sigsession.h"
 
-#include <assert.h>
-
-#include <boost/foreach.hpp>
+#include <cassert>
+#include <algorithm>
 
 #include <QApplication>
 #include <QMenu>
@@ -34,129 +33,181 @@
 #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) :
 	MarginWidget(parent),
 	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
 
-	connect(&_view.session(), SIGNAL(signals_changed()),
-		this, SLOT(on_signals_changed()));
-
 	connect(&_view, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
 }
 
-shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
+QSize Header::sizeHint() const
 {
-	const int w = width();
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
-	{
-		assert(t);
-		if (t->pt_in_label_rect(0, w, pt))
-			return t;
-	}
+	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);
+}
 
-	return shared_ptr<Trace>();
+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()
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
-		assert(t);
-		t->select(false);
+	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()));
 	}
+}
 
-	update();
+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*)
 {
-	const int w = width();
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	// 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 bool dragging = !_drag_traces.empty();
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(t);
+		assert(r);
 
-		const bool highlight = !dragging && t->pt_in_label_rect(
-			0, w, _mouse_point);
-		t->paint_label(painter, w, highlight);
+		const bool highlight = !_dragging &&
+			r->label_rect(w).contains(_mouse_point);
+		r->paint_label(painter, w, highlight);
 	}
 
 	painter.end();
 }
 
+void Header::mouseLeftPressEvent(QMouseEvent *event)
+{
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+	// Clear selection if control is not pressed and this item is unselected
+	const shared_ptr<RowItem> mouse_over =
+		get_mouse_over_row_item(event->pos());
+	if (!ctrl_pressed && (!mouse_over || !mouse_over->selected()))
+		for (shared_ptr<RowItem> r : _view)
+			r->select(false);
+
+	// Set the signal selection state if the item has been clicked
+	if (mouse_over) {
+		if (ctrl_pressed)
+			mouse_over->select(!mouse_over->selected());
+		else
+			mouse_over->select(true);
+	}
+
+	// Save the offsets of any signals which will be dragged
+	_mouse_down_point = event->pos();
+	for (const shared_ptr<RowItem> r : _view)
+		if (r->selected())
+			r->drag();
+
+	selection_changed();
+	update();
+}
+
 void Header::mousePressEvent(QMouseEvent *event)
+{
+	assert(event);
+	if (event->button() & Qt::LeftButton)
+		mouseLeftPressEvent(event);
+}
+
+void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
-	if (event->button() & Qt::LeftButton) {
-		_mouse_down_point = event->pos();
+	// Unselect everything if control is not pressed
+	const shared_ptr<RowItem> mouse_over =
+		get_mouse_over_row_item(event->pos());
 
-		// Save the offsets of any signals which will be dragged
-		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
-			if (t->selected())
-				_drag_traces.push_back(
-					make_pair(t, t->get_v_offset()));
-	}
+	for (auto &r : _view)
+		r->drag_release();
 
-	// Select the signal if it has been clicked
-	const shared_ptr<Trace> mouse_over_trace =
-		get_mouse_over_trace(event->pos());
-	if (mouse_over_trace) {
-		if (mouse_over_trace->selected())
-			mouse_over_trace->select(false);
-		else {
-			mouse_over_trace->select(true);
-
-			if (~QApplication::keyboardModifiers() &
-				Qt::ControlModifier)
-				_drag_traces.clear();
-
-			// Add the signal to the drag list
-			if (event->button() & Qt::LeftButton)
-				_drag_traces.push_back(
-					make_pair(mouse_over_trace,
-					mouse_over_trace->get_v_offset()));
-		}
-	}
+	if (_dragging)
+		_view.normalize_layout();
+	else
+	{
+		if (!ctrl_pressed) {
+			for (shared_ptr<RowItem> r : _view)
+				if (mouse_over != r)
+					r->select(false);
 
-	if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
-		// Unselect all other signals because the Ctrl is not
-		// pressed
-		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
-			if (t != mouse_over_trace)
-				t->select(false);
+			if (mouse_over)
+				show_popup(mouse_over);
+		}
 	}
 
-	selection_changed();
-	update();
+	_dragging = false;
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
-	if (event->button() == Qt::LeftButton) {
-		_dragging = false;
-		_drag_traces.clear();
-		_view.normalize_layout();
-	}
+	if (event->button() & Qt::LeftButton)
+		mouseLeftReleaseEvent(event);
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
@@ -171,33 +222,33 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 		QApplication::startDragDistance())
 		return;
 
-	// Move the signals if we are dragging
-	if (!_drag_traces.empty())
-	{
-		_dragging = true;
-
-		const int delta = event->pos().y() - _mouse_down_point.y();
-
-		for (std::list<std::pair<boost::weak_ptr<Trace>,
-			int> >::iterator i = _drag_traces.begin();
-			i != _drag_traces.end(); i++) {
-			const boost::shared_ptr<Trace> trace((*i).first);
-			if (trace) {
-				const int y = (*i).second + delta;
-				const int y_snap =
-					((y + View::SignalSnapGridSize / 2) /
-						View::SignalSnapGridSize) *
-						View::SignalSnapGridSize;
-				trace->set_v_offset(y_snap);
-
-				// Ensure the trace is selected
-				trace->select();
-			}
-			
+	// 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;
 		}
 
-		signals_moved();
-	}
+	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();
 }
@@ -210,18 +261,30 @@ void Header::leaveEvent(QEvent*)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<Trace> t = get_mouse_over_trace(_mouse_point);
+	const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+	if (!r)
+		return;
+
+	QMenu *const menu = r->create_context_menu(this);
+	if (!menu)
+		return;
 
-	if (t)
-		t->create_context_menu(this)->exec(event->globalPos());
+	menu->exec(event->globalPos());
 }
 
-void Header::on_signals_changed()
+void Header::keyPressEvent(QKeyEvent *e)
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
-		assert(t);
-		connect(t.get(), SIGNAL(text_changed()), this, SLOT(update()));
+	assert(e);
+
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		for (const shared_ptr<RowItem> r : _view)
+			if (r->selected())
+				r->delete_pressed();
+		break;
+	}
 	}
 }
 
@@ -230,6 +293,11 @@ void Header::on_signals_moved()
 	update();
 }
 
+void Header::on_trace_changed()
+{
+	update();
+	geometry_updated();
+}
 
 } // namespace view
 } // namespace pv