X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=60d64b2f401f2483aad1226dc00e66d62ca54191;hp=aaa98ab85fb59ab6da9583ac277d758736850da3;hb=af503b104d890a357c736c678bb00296d889c090;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index aaa98ab8..60d64b2f 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -18,53 +18,197 @@
  * 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 <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<TraceTreeItem> r)
+{
+	return r->selected();
+}
+
 Header::Header(View &parent) :
-	QWidget(&parent),
-	_view(parent)
+	MarginWidget(parent)
+{
+}
+
+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);
+}
+
+QSize Header::extended_size_hint() const
 {
+	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-void Header::paintEvent(QPaintEvent *event)
+vector< shared_ptr<ViewItem> > Header::items()
 {
-	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+}
+
+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<TraceTreeItem>();
+}
+
+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 QRect rect(0, 0, width() - BaselineOffset, height());
+
+	vector< shared_ptr<TraceTreeItem> > items(
+		view_.begin(), view_.end());
+
+	stable_sort(items.begin(), items.end(),
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
+			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	for (const shared_ptr<TraceTreeItem> r : items)
 	{
-		assert(s);
-
-		const QRect label_rect(0, offset, w, View::SignalHeight);
-		s->paint_label(painter, label_rect);
+		assert(r);
 
-		offset += View::SignalHeight;
+		const bool highlight = !item_dragging_ &&
+			r->label_rect(rect).contains(mouse_point_);
+		r->paint_label(painter, rect, highlight);
 	}
 
 	painter.end();
 }
 
+void Header::contextMenuEvent(QContextMenuEvent *event)
+{
+	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 (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);
+
+	MarginWidget::keyPressEvent(e);
+
+	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_group()
+{
+	vector< shared_ptr<TraceTreeItem> > 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<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
+			return a->visual_v_offset() < b->visual_v_offset(); });
+
+	shared_ptr<TraceGroup> group(new TraceGroup());
+	shared_ptr<TraceTreeItem> mouse_down_item(
+		std::dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+	shared_ptr<TraceTreeItem> 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<TraceTreeItem> &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<TraceTreeItem> 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