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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 284bb372..8377cb2c 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -21,133 +21,298 @@
 #include "header.h"
 #include "view.h"
 
-#include "../signal.h"
+#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.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
+
+	// Trigger the initial event manually. The default device has signals
+	// which were created before this object came into being
+	on_signals_changed();
 }
 
-void Header::paintEvent(QPaintEvent *event)
+QSize Header::sizeHint() const
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	int max_width = 0;
 
-	QPainter painter(this);
-	painter.setRenderHint(QPainter::Antialiasing);
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (shared_ptr<RowItem> r : row_items) {
+		assert(r);
 
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
+		if (r->enabled()) {
+			max_width = max(max_width, (int)r->label_rect(0).width());
+		}
+	}
 
-		const QRect signal_heading_rect(
-			0, offset, w, View::SignalHeight);
+	return QSize(max_width + Padding + BaselineOffset, 0);
+}
 
-		s->paint_label(painter, signal_heading_rect,
-			s->pt_in_label_rect(signal_heading_rect, _mouse_point));
+shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+{
+	const int w = width() - BaselineOffset;
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
 
-		offset += View::SignalHeight;
+	for (const shared_ptr<RowItem> r : row_items)
+	{
+		assert(r);
+		if (r->enabled() && r->label_rect(w).contains(pt))
+			return r;
 	}
 
-	painter.end();
+	return shared_ptr<RowItem>();
 }
 
-void Header::mouseMoveEvent(QMouseEvent *event)
+void Header::clear_selection()
 {
-	assert(event);
-	_mouse_point = event->pos();
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (const shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		r->select(false);
+	}
+
 	update();
 }
 
-void Header::leaveEvent(QEvent *event)
+void Header::show_popup(const shared_ptr<RowItem> &item)
 {
-	_mouse_point = QPoint(-1, -1);
-	update();
+	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::contextMenuEvent(QContextMenuEvent *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;
 
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	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_row_items.empty();
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(s);
+		assert(r);
 
-		const QRect signal_heading_rect(
-			0, offset, w, View::SignalHeight);
+		const bool highlight = !dragging &&
+			r->label_rect(w).contains(_mouse_point);
+		r->paint_label(painter, w, highlight);
+	}
 
-		if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
-			QMenu menu(this);
-			menu.addAction(_action_set_name);
-			menu.addAction(_action_set_colour);
+	painter.end();
+}
 
-			_context_signal = s;
-			menu.exec(event->globalPos());
-			_context_signal.reset();
+void Header::mousePressEvent(QMouseEvent *event)
+{
+	assert(event);
+
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+
+	if (event->button() & Qt::LeftButton) {
+		_mouse_down_point = event->pos();
+
+		// Save the offsets of any signals which will be dragged
+		for (const shared_ptr<RowItem> r : row_items)
+			if (r->selected())
+				_drag_row_items.push_back(
+					make_pair(r, r->v_offset()));
+	}
 
-			break;
+	// Select the signal if it has been clicked
+	const shared_ptr<RowItem> mouse_over_row_item =
+		get_mouse_over_row_item(event->pos());
+	if (mouse_over_row_item) {
+		if (mouse_over_row_item->selected())
+			mouse_over_row_item->select(false);
+		else {
+			mouse_over_row_item->select(true);
+
+			if (~QApplication::keyboardModifiers() &
+				Qt::ControlModifier)
+				_drag_row_items.clear();
+
+			// Add the signal to the drag list
+			if (event->button() & Qt::LeftButton)
+				_drag_row_items.push_back(
+					make_pair(mouse_over_row_item,
+					mouse_over_row_item->v_offset()));
 		}
+	}
 
-		offset += View::SignalHeight;
+	if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
+		// Unselect all other signals because the Ctrl is not
+		// pressed
+		for (const shared_ptr<RowItem> r : row_items)
+			if (r != mouse_over_row_item)
+				r->select(false);
 	}
+
+	selection_changed();
+	update();
 }
 
-void Header::on_action_set_name_triggered()
+void Header::mouseReleaseEvent(QMouseEvent *event)
 {
-	boost::shared_ptr<Signal> context_signal = _context_signal;
-	if(!context_signal)
+	assert(event);
+	if (event->button() == Qt::LeftButton) {
+		if (_dragging)
+			_view.normalize_layout();
+		else
+		{
+			const shared_ptr<RowItem> mouse_over_row_item =
+				get_mouse_over_row_item(event->pos());
+			if (mouse_over_row_item)
+				show_popup(mouse_over_row_item);
+		}
+
+		_dragging = false;
+		_drag_row_items.clear();
+	}
+}
+
+void Header::mouseMoveEvent(QMouseEvent *event)
+{
+	assert(event);
+	_mouse_point = event->pos();
+
+	if (!(event->buttons() & Qt::LeftButton))
 		return;
 
-	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_signal->get_name());
+	if ((event->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
 
-	if(!new_label.isEmpty())
-		context_signal->set_name(new_label);
+	// Move the signals if we are dragging
+	if (!_drag_row_items.empty())
+	{
+		_dragging = true;
+
+		const int delta = event->pos().y() - _mouse_down_point.y();
+
+		for (auto i = _drag_row_items.begin();
+			i != _drag_row_items.end(); i++) {
+			const std::shared_ptr<RowItem> row_item((*i).first);
+			if (row_item) {
+				const int y = (*i).second + delta;
+				const int y_snap =
+					((y + View::SignalSnapGridSize / 2) /
+						View::SignalSnapGridSize) *
+						View::SignalSnapGridSize;
+				row_item->set_v_offset(y_snap);
+
+				// Ensure the trace is selected
+				row_item->select();
+			}
+			
+		}
+
+		signals_moved();
+	}
+
+	update();
 }
 
-void Header::on_action_set_colour_triggered()
+void Header::leaveEvent(QEvent*)
 {
-	boost::shared_ptr<Signal> context_signal = _context_signal;
-	if(!context_signal)
-		return;
+	_mouse_point = QPoint(-1, -1);
+	update();
+}
+
+void Header::contextMenuEvent(QContextMenuEvent *event)
+{
+	const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+
+	if (r)
+		r->create_context_menu(this)->exec(event->globalPos());
+}
+
+void Header::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
 
-	const QColor new_colour = QColorDialog::getColor(
-		context_signal->get_colour(), this, tr("Set Colour"));
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+		for (const shared_ptr<RowItem> r : row_items)
+			if (r->selected())
+				r->delete_pressed();
+		break;
+	}
+	}
+}
 
-	if(new_colour.isValid())
-		context_signal->set_colour(new_colour);
+void Header::on_signals_changed()
+{
+	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	for (shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		connect(r.get(), SIGNAL(visibility_changed()),
+			this, SLOT(on_trace_changed()));
+		connect(r.get(), SIGNAL(text_changed()),
+			this, SLOT(on_trace_changed()));
+		connect(r.get(), SIGNAL(colour_changed()),
+			this, SLOT(update()));
+	}
+}
+
+void Header::on_signals_moved()
+{
+	update();
+}
+
+void Header::on_trace_changed()
+{
+	update();
+	geometry_updated();
 }
 
 } // namespace view