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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 514a3e49..23cbb0ff 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -22,11 +22,14 @@
 #include "view.h"
 
 #include "signal.h"
+#include "tracegroup.h"
 #include "../sigsession.h"
 
 #include <cassert>
 #include <algorithm>
 
+#include <boost/iterator/filter_iterator.hpp>
+
 #include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
@@ -35,8 +38,11 @@
 
 #include <pv/widgets/popup.h>
 
+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;
@@ -48,6 +54,11 @@ 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) :
 	MarginWidget(parent),
 	_dragging(false)
@@ -84,15 +95,6 @@ void Header::clear_selection()
 	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;
@@ -101,7 +103,7 @@ void Header::show_popup(const shared_ptr<RowItem> &item)
 	if (!p)
 		return;
 
-	const QPoint pt(width() - BaselineOffset, item->get_y());
+	const QPoint pt(width() - BaselineOffset, item->get_visual_y());
 	p->set_position(mapToGlobal(pt), Popup::Right);
 	p->show();
 }
@@ -118,7 +120,7 @@ void Header::paintEvent(QPaintEvent*)
 
 	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(); });
+			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
@@ -190,7 +192,9 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 	for (auto &r : _view)
 		r->drag_release();
 
-	if (!_dragging)
+	if (_dragging)
+		_view.restack_all_row_items();
+	else
 	{
 		if (!ctrl_pressed) {
 			for (shared_ptr<RowItem> r : _view)
@@ -246,12 +250,15 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
 	for (std::shared_ptr<RowItem> r : _view)
 		if (r->dragging()) {
-			r->set_v_offset(r->drag_point().y() + delta);
+			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();
@@ -269,9 +276,21 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 	if (!r)
 		return;
 
-	QMenu *const menu = r->create_context_menu(this);
+	QMenu *menu = r->create_context_menu(this);
 	if (!menu)
-		return;
+		menu = new QMenu(this);
+
+	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());
 }
@@ -297,10 +316,54 @@ void Header::on_signals_moved()
 	update();
 }
 
-void Header::on_trace_changed()
+void Header::on_group()
 {
-	update();
-	geometry_updated();
+	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