X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=7c68f302846b5b4f6d41b020abdef6c15f98df69;hp=549b71918627b4bd1a6d0e01f2e20f6fe17994f6;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hpb=728fcafc9897d3ffb4a109b6248d88b0945128f5

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 549b719..7c68f30 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -26,24 +26,30 @@
 
 #include <assert.h>
 
-#include <boost/foreach.hpp>
-
 #include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 
-using namespace boost;
-using namespace std;
+#include <pv/widgets/popup.h>
+
+using boost::shared_ptr;
+using std::max;
+using std::make_pair;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
 
+const int Header::Padding = 12;
+
 Header::Header(View &parent) :
 	MarginWidget(parent),
 	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
 
 	connect(&_view.session(), SIGNAL(signals_changed()),
@@ -51,6 +57,26 @@ Header::Header(View &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<Trace> > traces(_view.get_traces());
+	for (shared_ptr<Trace> t : traces) {
+		assert(t);
+
+		if (t->enabled()) {
+			max_width = max(max_width, (int)t->get_label_rect(0).width());
+		}
+	}
+
+	return QSize(max_width + Padding, 0);
 }
 
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
@@ -58,7 +84,7 @@ shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 	const int w = width();
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 	{
 		assert(t);
 		if (t->pt_in_label_rect(0, w, pt))
@@ -71,7 +97,7 @@ shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 void Header::clear_selection()
 {
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+	for (const shared_ptr<Trace> t : traces) {
 		assert(t);
 		t->select(false);
 	}
@@ -88,7 +114,7 @@ void Header::paintEvent(QPaintEvent*)
 	painter.setRenderHint(QPainter::Antialiasing);
 
 	const bool dragging = !_drag_traces.empty();
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 	{
 		assert(t);
 
@@ -110,7 +136,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 		_mouse_down_point = event->pos();
 
 		// Save the offsets of any signals which will be dragged
-		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		for (const shared_ptr<Trace> t : traces)
 			if (t->selected())
 				_drag_traces.push_back(
 					make_pair(t, t->get_v_offset()));
@@ -140,7 +166,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 	if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
 		// Unselect all other signals because the Ctrl is not
 		// pressed
-		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		for (const shared_ptr<Trace> t : traces)
 			if (t != mouse_over_trace)
 				t->select(false);
 	}
@@ -151,11 +177,28 @@ void Header::mousePressEvent(QMouseEvent *event)
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
+	using pv::widgets::Popup;
+
 	assert(event);
 	if (event->button() == Qt::LeftButton) {
+		if (_dragging)
+			_view.normalize_layout();
+		else
+		{
+			const shared_ptr<Trace> mouse_over_trace =
+				get_mouse_over_trace(event->pos());
+			if (mouse_over_trace) {
+				Popup *const p =
+					mouse_over_trace->create_popup(&_view);
+				p->set_position(mapToGlobal(QPoint(width(),
+					mouse_over_trace->get_y())),
+					Popup::Right);
+				p->show();
+			}
+		}
+
 		_dragging = false;
 		_drag_traces.clear();
-		_view.normalize_layout();
 	}
 }
 
@@ -178,9 +221,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
 		const int delta = event->pos().y() - _mouse_down_point.y();
 
-		for (std::list<std::pair<boost::weak_ptr<Trace>,
-			int> >::iterator i = _drag_traces.begin();
-			i != _drag_traces.end(); i++) {
+		for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
 			const boost::shared_ptr<Trace> trace((*i).first);
 			if (trace) {
 				const int y = (*i).second + delta;
@@ -216,12 +257,34 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 		t->create_context_menu(this)->exec(event->globalPos());
 }
 
+void Header::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
+
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		const vector< shared_ptr<Trace> > traces(_view.get_traces());
+		for (const shared_ptr<Trace> t : traces)
+			if (t->selected())
+				t->delete_pressed();	
+		break;
+	}
+	}
+}
+
 void Header::on_signals_changed()
 {
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+	for (shared_ptr<Trace> t : traces) {
 		assert(t);
-		connect(t.get(), SIGNAL(text_changed()), this, SLOT(update()));
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(on_trace_changed()));
+		connect(t.get(), SIGNAL(text_changed()),
+			this, SLOT(on_trace_changed()));
+		connect(t.get(), SIGNAL(colour_changed()),
+			this, SLOT(update()));
 	}
 }
 
@@ -230,6 +293,11 @@ void Header::on_signals_moved()
 	update();
 }
 
+void Header::on_trace_changed()
+{
+	update();
+	geometry_updated();
+}
 
 } // namespace view
 } // namespace pv