X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=ca5df96fca250dc23666bbdcf59f644a07083139;hp=cb161a6961ad0cd3aa164f9bbb0523e0fbfbd651;hb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;hpb=a2ae0205f2737dfd8f7647f9eae2fdcb47a0ad25

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index cb161a69..ca5df96f 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -29,62 +29,69 @@
 #include <boost/foreach.hpp>
 
 #include <QApplication>
-#include <QColorDialog>
-#include <QInputDialog>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 
+#include <pv/widgets/popup.h>
+
 using namespace boost;
 using namespace std;
 
 namespace pv {
 namespace view {
 
+const int Header::Padding = 12;
+
 Header::Header(View &parent) :
 	MarginWidget(parent),
-	_action_set_name(new QAction(tr("Set &Name..."), this)),
-	_action_set_colour(new QAction(tr("Set &Colour..."), this))
+	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
 
-	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()));
+	connect(&_view.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
 
 	connect(&_view, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
 }
 
-boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
-	const QPoint &pt)
+QSize Header::sizeHint() const
+{
+	int max_width = 0;
+
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		assert(t);
+		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)
 {
 	const int w = width();
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
-	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
-
-		if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
-			0, w, pt))
-			return s;
+		assert(t);
+		if (t->pt_in_label_rect(0, w, pt))
+			return t;
 	}
 
-	return shared_ptr<Signal>();
+	return shared_ptr<Trace>();
 }
 
 void Header::clear_selection()
 {
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
-		assert(s);
-		s->select(false);
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+		assert(t);
+		t->select(false);
 	}
 
 	update();
@@ -93,22 +100,19 @@ void Header::clear_selection()
 void Header::paintEvent(QPaintEvent*)
 {
 	const int w = width();
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	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)
+	const bool dragging = !_drag_traces.empty();
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
+		assert(t);
 
-		const int y = s->get_v_offset() - v_offset;
-		const bool highlight = !dragging && s->pt_in_label_rect(
-			y, 0, w, _mouse_point);
-		s->paint_label(painter, y, w, highlight);
+		const bool highlight = !dragging && t->pt_in_label_rect(
+			0, w, _mouse_point);
+		t->paint_label(painter, w, highlight);
 	}
 
 	painter.end();
@@ -118,57 +122,75 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	if (event->button() & Qt::LeftButton) {
 		_mouse_down_point = event->pos();
 
 		// 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()));
+		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+			if (t->selected())
+				_drag_traces.push_back(
+					make_pair(t, t->get_v_offset()));
 	}
 
 	// 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);
+	const shared_ptr<Trace> mouse_over_trace =
+		get_mouse_over_trace(event->pos());
+	if (mouse_over_trace) {
+		if (mouse_over_trace->selected())
+			mouse_over_trace->select(false);
 		else {
-			mouse_over_signal->select(true);
+			mouse_over_trace->select(true);
 
 			if (~QApplication::keyboardModifiers() &
 				Qt::ControlModifier)
-				_drag_sigs.clear();
+				_drag_traces.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()));
+				_drag_traces.push_back(
+					make_pair(mouse_over_trace,
+					mouse_over_trace->get_v_offset()));
 		}
 	}
 
 	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);
+		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+			if (t != mouse_over_trace)
+				t->select(false);
 	}
 
+	selection_changed();
 	update();
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
+	using pv::widgets::Popup;
+
 	assert(event);
 	if (event->button() == Qt::LeftButton) {
-		_drag_sigs.clear();
-		_view.normalize_layout();
+		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();
 	}
 }
 
@@ -177,24 +199,34 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	assert(event);
 	_mouse_point = event->pos();
 
+	if (!(event->buttons() & Qt::LeftButton))
+		return;
+
+	if ((event->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
+
 	// Move the signals if we are dragging
-	if (!_drag_sigs.empty()) {
+	if (!_drag_traces.empty())
+	{
+		_dragging = true;
+
 		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) {
+		for (std::list<std::pair<boost::weak_ptr<Trace>,
+			int> >::iterator 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;
 				const int y_snap =
 					((y + View::SignalSnapGridSize / 2) /
 						View::SignalSnapGridSize) *
 						View::SignalSnapGridSize;
-				sig->set_v_offset(y_snap);
+				trace->set_v_offset(y_snap);
 
-				// Ensure the signal is selected
-				sig->select();
+				// Ensure the trace is selected
+				trace->select();
 			}
 			
 		}
@@ -213,46 +245,41 @@ void Header::leaveEvent(QEvent*)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<Signal> s = get_mouse_over_signal(_mouse_point);
-
-	if (!s)
-		return;
+	const shared_ptr<Trace> t = get_mouse_over_trace(_mouse_point);
 
-	QMenu menu(this);
-	menu.addAction(_action_set_name);
-	menu.addAction(_action_set_colour);
-
-	_context_signal = s;
-	menu.exec(event->globalPos());
-	_context_signal.reset();
+	if (t)
+		t->create_context_menu(this)->exec(event->globalPos());
 }
 
-void Header::on_action_set_name_triggered()
+void Header::keyPressEvent(QKeyEvent *e)
 {
-	bool ok = false;
+	assert(e);
 
-	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(), &ok);
-
-	if (ok)
-		context_signal->set_name(new_label);
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		const vector< shared_ptr<Trace> > traces(_view.get_traces());
+		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+			if (t->selected())
+				t->delete_pressed();	
+		break;
+	}
+	}
 }
 
-void Header::on_action_set_colour_triggered()
+void Header::on_signals_changed()
 {
-	shared_ptr<view::Signal> context_signal = _context_signal;
-	if (!context_signal)
-		return;
-
-	const QColor new_colour = QColorDialog::getColor(
-		context_signal->get_colour(), this, tr("Set Colour"));
-
-	if (new_colour.isValid())
-		context_signal->set_colour(new_colour);
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		assert(t);
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+		connect(t.get(), SIGNAL(text_changed()),
+			this, SLOT(on_trace_text_changed()));
+		connect(t.get(), SIGNAL(colour_changed()),
+			this, SLOT(update()));
+	}
 }
 
 void Header::on_signals_moved()
@@ -260,6 +287,11 @@ void Header::on_signals_moved()
 	update();
 }
 
+void Header::on_trace_text_changed()
+{
+	update();
+	geometry_updated();
+}
 
 } // namespace view
 } // namespace pv