X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=a2a7c505cfd420c5b6b66e3e6224795c7ecdabe9;hp=361a60c138208911ce5bf044c685f8d0c4a3d52a;hb=bc01bb31fb03f69c8ceef57676b3399d7a08dcd9;hpb=eae6e30af53f6b3e42dc5be212c82870078276b0

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 361a60c1..a2a7c505 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -18,13 +18,16 @@
  * 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/iterator/filter_iterator.hpp>
 
 #include <QApplication>
 #include <QMenu>
@@ -32,12 +35,17 @@
 #include <QPainter>
 #include <QRect>
 
-#include <pv/widgets/popup.h>
+#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 {
@@ -46,63 +54,45 @@ namespace view {
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
 
-Header::Header(View &parent) :
-	MarginWidget(parent),
-	_dragging(false)
+static bool item_selected(shared_ptr<RowItem> r)
 {
-	setFocusPolicy(Qt::ClickFocus);
-	setMouseTracking(true);
-
-	connect(&_view.session(), SIGNAL(signals_changed()),
-		this, SLOT(on_signals_changed()));
+	return r->selected();
+}
 
-	connect(&_view, SIGNAL(signals_moved()),
+Header::Header(View &parent) :
+	MarginWidget(parent)
+{
+	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();
 }
 
 QSize Header::sizeHint() const
 {
-	int max_width = 0;
-
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-	for (shared_ptr<RowItem> r : row_items) {
-		assert(r);
-
-		if (r->enabled()) {
-			max_width = max(max_width, (int)r->label_rect(0).width());
-		}
-	}
-
-	return QSize(max_width + Padding + BaselineOffset, 0);
+	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);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+QSize Header::extended_size_hint() const
 {
-	const int w = width() - BaselineOffset;
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-
-	for (const shared_ptr<RowItem> r : row_items)
-	{
-		assert(r);
-		if (r->enabled() && r->label_rect(w).contains(pt))
-			return r;
-	}
+	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
+}
 
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
+{
+	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>();
 }
 
 void Header::clear_selection()
 {
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-	for (const shared_ptr<RowItem> r : row_items) {
-		assert(r);
-		r->select(false);
-	}
-
+	for (auto &i : view_)
+		i->select(false);
 	update();
 }
 
@@ -111,198 +101,253 @@ void Header::paintEvent(QPaintEvent*)
 	// 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;
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	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 bool dragging = !_drag_row_items.empty();
 	for (const shared_ptr<RowItem> r : row_items)
 	{
 		assert(r);
 
-		const bool highlight = !dragging &&
-			r->label_rect(w).contains(_mouse_point);
-		r->paint_label(painter, w, highlight);
+		const bool highlight = !dragging_ &&
+			r->label_rect(rect).contains(mouse_point_);
+		r->paint_label(painter, rect, highlight);
 	}
 
 	painter.end();
 }
 
-void Header::mousePressEvent(QMouseEvent *event)
+void Header::mouseLeftPressEvent(QMouseEvent *event)
 {
-	assert(event);
+	(void)event;
 
-	const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
-	if (event->button() & Qt::LeftButton) {
-		_mouse_down_point = event->pos();
+	// 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);
 
-		// 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()));
-	}
-
-	// 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()));
-		}
+	// 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);
 	}
 
-	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);
-	}
+	// 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::mouseReleaseEvent(QMouseEvent *event)
+void Header::mousePressEvent(QMouseEvent *event)
 {
-	using pv::widgets::Popup;
+	assert(event);
+
+	mouse_down_point_ = event->pos();
+	mouse_down_item_ = get_mouse_over_item(event->pos());
+
+	if (event->button() & Qt::LeftButton)
+		mouseLeftPressEvent(event);
+}
 
+void Header::mouseLeftReleaseEvent(QMouseEvent *event)
+{
 	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) {
-				const int w = width() - BaselineOffset;
-				Popup *const p =
-					mouse_over_row_item->create_popup(&_view);
-				p->set_position(mapToGlobal(QPoint(w,
-					mouse_over_row_item->get_y())),
-					Popup::Right);
-				p->show();
-			}
-		}
 
-		_dragging = false;
-		_drag_row_items.clear();
+	const bool ctrl_pressed =
+		QApplication::keyboardModifiers() & Qt::ControlModifier;
+
+	// Unselect everything if control is not pressed
+	const shared_ptr<ViewItem> 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 (mouse_down_item_)
+				show_popup(mouse_down_item_);
+		}
 	}
+
+	dragging_ = false;
+}
+
+void Header::mouseReleaseEvent(QMouseEvent *event)
+{
+	assert(event);
+	if (event->button() & Qt::LeftButton)
+		mouseLeftReleaseEvent(event);
+
+	mouse_down_item_ = nullptr;
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
-	_mouse_point = event->pos();
+	mouse_point_ = event->pos();
 
 	if (!(event->buttons() & Qt::LeftButton))
 		return;
 
-	if ((event->pos() - _mouse_down_point).manhattanLength() <
+	if ((event->pos() - mouse_down_point_).manhattanLength() <
 		QApplication::startDragDistance())
 		return;
 
-	// 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();
-			}
-			
+	// 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;
 
-	update();
-}
+	// Do the drag
+	dragging_ = true;
+
+	const QPoint delta = event->pos() - mouse_down_point_;
+
+	for (std::shared_ptr<RowItem> r : view_)
+		if (r->dragging()) {
+			r->drag_by(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();
 
-void Header::leaveEvent(QEvent*)
-{
-	_mouse_point = QPoint(-1, -1);
 	update();
 }
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
+	if (!r)
+		return;
+
+	QMenu *menu = r->create_context_menu(this);
+	if (!menu)
+		menu = new QMenu(this);
 
-	if (r)
-		r->create_context_menu(this)->exec(event->globalPos());
+	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);
+	}
+
+	menu->exec(event->globalPos());
 }
 
 void Header::keyPressEvent(QKeyEvent *e)
 {
 	assert(e);
 
-	switch (e->key())
+	if (e->key() == Qt::Key_Delete)
 	{
-	case Qt::Key_Delete:
-	{
-		const vector< shared_ptr<RowItem> > row_items(_view.child_items());
-		for (const shared_ptr<RowItem> r : row_items)
+		for (const shared_ptr<RowItem> r : view_)
 			if (r->selected())
 				r->delete_pressed();
-		break;
-	}
 	}
+	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_changed()
+void Header::on_signals_moved()
 {
-	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()));
-	}
+	update();
 }
 
-void Header::on_signals_moved()
+void Header::on_group()
 {
-	update();
+	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> mouse_down_item(
+		std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
+	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_trace_changed()
+void Header::on_ungroup()
 {
-	update();
-	geometry_updated();
+	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