X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=c19d10883af7fed3c77e3ee60d0f497faadb2958;hp=a615e8513e7ff04d95b1b56af7c24299858af4c9;hb=859eed5994e0395cc7b69442f961b23ec0b19eed;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index a615e851..c19d1088 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -18,234 +18,298 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "header.h"
-#include "view.h"
+#include "header.hpp"
+#include "view.hpp"
 
-#include "signal.h"
-#include "../sigsession.h"
+#include "signal.hpp"
+#include "tracegroup.hpp"
 
-#include <assert.h>
+#include <cassert>
+#include <algorithm>
 
-#include <boost/foreach.hpp>
+#include <boost/iterator/filter_iterator.hpp>
 
 #include <QApplication>
-#include <QColorDialog>
-#include <QInputDialog>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 
-using namespace boost;
-using namespace std;
+#include <pv/session.hpp>
+#include <pv/widgets/popup.hpp>
+
+using boost::make_filter_iterator;
+using std::dynamic_pointer_cast;
+using std::max;
+using std::make_pair;
+using std::min;
+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;
+
+static bool item_selected(shared_ptr<RowItem> r)
+{
+	return r->selected();
+}
+
 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)
 {
-	setMouseTracking(true);
+	connect(&view_, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
+}
 
-	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()));
+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(QRect()));
+	return QSize(max_rect.width() + Padding + BaselineOffset, 0);
+}
 
-	connect(&_view, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
+QSize Header::extended_size_hint() const
+{
+	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
-	const QPoint &pt)
+shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	const QRect r(0, 0, width() - BaselineOffset, height());
+	for (auto &i : view_)
+		if (i->enabled() && i->label_rect(r).contains(pt))
+			return i;
+	return shared_ptr<RowItem>();
+}
 
-	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
+void Header::clear_selection()
+{
+	for (auto &i : view_)
+		i->select(false);
+	update();
+}
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
+void Header::show_popup(const shared_ptr<RowItem> &item)
+{
+	using pv::widgets::Popup;
 
-		if (s->pt_in_label_rect(signal_heading_rect, pt))
-			return s;
-	}
+	Popup *const p = item->create_popup(&view_);
+	if (!p)
+		return;
 
-	return shared_ptr<Signal>();
+	const QPoint pt(width() - BaselineOffset, item->get_visual_y());
+	p->set_position(mapToGlobal(pt), Popup::Right);
+	p->show();
 }
 
 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 QRect rect(0, 0, width() - BaselineOffset, height());
+
+	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->visual_v_offset() < b->visual_v_offset(); });
 
 	QPainter painter(this);
 	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)
+	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);
 
-		const bool highlight = !dragging && s->pt_in_label_rect(
-			signal_heading_rect, _mouse_point);
-		s->paint_label(painter, signal_heading_rect, highlight);
+		const bool highlight = !dragging_ &&
+			r->label_rect(rect).contains(mouse_point_);
+		r->paint_label(painter, rect, highlight);
 	}
 
 	painter.end();
 }
 
+void Header::mouseLeftPressEvent(QMouseEvent *event)
+{
+	(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::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	mouse_down_point_ = event->pos();
+	mouse_down_item_ = get_mouse_over_item(event->pos());
 
-	if (event->button() & Qt::LeftButton) {
-		_mouse_down_point = event->pos();
+	if (event->button() & Qt::LeftButton)
+		mouseLeftPressEvent(event);
+}
 
-		// 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()));
-	}
+void Header::mouseLeftReleaseEvent(QMouseEvent *event)
+{
+	assert(event);
 
-	// 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);
-
-			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()));
-		}
-	}
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+	// Unselect everything if control is not pressed
+	const shared_ptr<RowItem> mouse_over =
+		get_mouse_over_item(event->pos());
+
+	for (auto &r : view_)
+		r->drag_release();
+
+	if (dragging_)
+		view_.restack_all_row_items();
+	else
+	{
+		if (!ctrl_pressed) {
+			for (shared_ptr<RowItem> r : view_)
+				if (mouse_down_item_ != r)
+					r->select(false);
 
-	if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
-		// Unselect all other signals because the Ctrl is not
-		// pressed
-		BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-			if (s != mouse_over_signal)
-				s->select(false);
+			if (mouse_down_item_)
+				show_popup(mouse_down_item_);
+		}
 	}
 
-	update();
+	dragging_ = false;
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
-	if (event->button() == Qt::LeftButton) {
-		_drag_sigs.clear();
-		_view.normalize_layout();
-	}
+	if (event->button() & Qt::LeftButton)
+		mouseLeftReleaseEvent(event);
+
+	mouse_down_item_ = nullptr;
 }
 
 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();
-			}
-			
+	mouse_point_ = event->pos();
+
+	if (!(event->buttons() & Qt::LeftButton))
+		return;
+
+	if ((event->pos() - mouse_down_point_).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
+
+	// 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->force_to_v_offset(r->drag_point().y() + delta);
+
+			// Ensure the trace is selected
+			r->select();
+		}
+
+	item_owner->restack_items();
+	for (const auto &r : *item_owner)
+		r->animate_to_layout_v_offset();
+	signals_moved();
 
 	update();
 }
 
 void Header::leaveEvent(QEvent*)
 {
-	_mouse_point = QPoint(-1, -1);
+	mouse_point_ = QPoint(-1, -1);
 	update();
 }
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<Signal> s = get_mouse_over_signal(_mouse_point);
-
-	if (!s)
+	const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
+	if (!r)
 		return;
 
-	QMenu menu(this);
-	menu.addAction(_action_set_name);
-	menu.addAction(_action_set_colour);
+	QMenu *menu = r->create_context_menu(this);
+	if (!menu)
+		menu = new QMenu(this);
 
-	_context_signal = s;
-	menu.exec(event->globalPos());
-	_context_signal.reset();
-}
-
-void Header::on_action_set_name_triggered()
-{
-	shared_ptr<view::Signal> context_signal = _context_signal;
-	if (!context_signal)
-		return;
-
-	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_signal->get_name());
+	if (std::count_if(view_.begin(), view_.end(), item_selected) > 1)
+	{
+		menu->addSeparator();
+
+		QAction *const group = new QAction(tr("Group"), this);
+		QList<QKeySequence> shortcuts;
+		shortcuts.append(QKeySequence(Qt::ControlModifier | Qt::Key_G));
+		group->setShortcuts(shortcuts);
+		connect(group, SIGNAL(triggered()), this, SLOT(on_group()));
+		menu->addAction(group);
+	}
 
-	if (!new_label.isEmpty())
-		context_signal->set_name(new_label);
+	menu->exec(event->globalPos());
 }
 
-void Header::on_action_set_colour_triggered()
+void Header::keyPressEvent(QKeyEvent *e)
 {
-	shared_ptr<view::Signal> context_signal = _context_signal;
-	if (!context_signal)
-		return;
+	assert(e);
 
-	const QColor new_colour = QColorDialog::getColor(
-		context_signal->get_colour(), this, tr("Set Colour"));
-
-	if (new_colour.isValid())
-		context_signal->set_colour(new_colour);
+	if (e->key() == Qt::Key_Delete)
+	{
+		for (const shared_ptr<RowItem> r : view_)
+			if (r->selected())
+				r->delete_pressed();
+	}
+	else if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+		on_group();
+	else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+		on_ungroup();
 }
 
 void Header::on_signals_moved()
@@ -253,6 +317,55 @@ void Header::on_signals_moved()
 	update();
 }
 
+void Header::on_group()
+{
+	vector< shared_ptr<RowItem> > selected_items(
+		make_filter_iterator(item_selected, view_.begin(), view_.end()),
+		make_filter_iterator(item_selected, view_.end(), view_.end()));
+	stable_sort(selected_items.begin(), selected_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->visual_v_offset() < b->visual_v_offset(); });
+
+	shared_ptr<TraceGroup> group(new TraceGroup());
+	shared_ptr<RowItem> focus_item(
+		mouse_down_item_ ? mouse_down_item_ : selected_items.front());
+
+	assert(focus_item);
+	assert(focus_item->owner());
+	focus_item->owner()->add_child_item(group);
+
+	// Set the group v_offset here before reparenting
+	group->force_to_v_offset(focus_item->layout_v_offset() +
+		focus_item->v_extents().first);
+
+	for (size_t i = 0; i < selected_items.size(); i++) {
+		const shared_ptr<RowItem> &r = selected_items[i];
+		assert(r->owner());
+		r->owner()->remove_child_item(r);
+		group->add_child_item(r);
+
+		// Put the items at 1-pixel offsets, so that restack will
+		// stack them in the right order
+		r->set_layout_v_offset(i);
+	}
+}
+
+void Header::on_ungroup()
+{
+	bool restart;
+	do {
+		restart = false;
+		for (const shared_ptr<RowItem> r : view_) {
+			const shared_ptr<TraceGroup> tg =
+				dynamic_pointer_cast<TraceGroup>(r);
+			if (tg && tg->selected()) {
+				tg->ungroup();
+				restart = true;
+				break;
+			}
+		}
+	} while(restart);
+}
 
 } // namespace view
 } // namespace pv