X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=28084544f6f4247aee1798e4081302f0f22d5b27;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hp=ff1fbddbcb5305185ec1abba301cc5e3857b7c19;hpb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ff1fbddb..28084544 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,9 +23,14 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QColorDialog>
+#include <QInputDialog>
+
 #include "trace.h"
 #include "view.h"
 
+#include <pv/widgets/popup.h>
+
 namespace pv {
 namespace view {
 
@@ -147,7 +152,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	p.drawPolygon(points, countof(points));
 
 	// Paint the text
-	p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white);
+	p.setPen(get_text_colour());
 	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
@@ -163,17 +168,54 @@ bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
 			).contains(point);
 }
 
+QMenu* Trace::create_context_menu(QWidget *parent)
+{
+	QMenu *const menu = SelectableItem::create_context_menu(parent);
+
+	QAction *const set_name = new QAction(tr("Set &Name..."), this);
+	connect(set_name, SIGNAL(triggered()),
+		this, SLOT(on_action_set_name_triggered()));
+	menu->addAction(set_name);
+
+	QAction *const set_colour = new QAction(tr("Set &Colour..."), this);
+	connect(set_colour, SIGNAL(triggered()),
+		this, SLOT(on_action_set_colour_triggered()));
+	menu->addAction(set_colour);
+
+	return menu;
+}
+
+pv::widgets::Popup* Trace::create_popup(QWidget *parent)
+{
+	using pv::widgets::Popup;
+	Popup *const popup = new Popup(parent);
+	QFormLayout *const form = new QFormLayout(popup);
+	popup->setLayout(form);
+	populate_popup_form(popup, form);
+	return popup;
+}
+
 int Trace::get_y() const
 {
 	return _v_offset - _view->v_offset();
 }
 
+QColor Trace::get_text_colour() const
+{
+	return (_colour.lightness() > 64) ? Qt::black : Qt::white;
+}
+
 void Trace::paint_axis(QPainter &p, int y, int left, int right)
 {
 	p.setPen(AxisPen);
 	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
 }
 
+void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	form->addRow("Name", new QLineEdit(parent));
+}
+
 void Trace::compute_text_size(QPainter &p)
 {
 	_text_size = QSize(
@@ -186,7 +228,6 @@ QRectF Trace::get_label_rect(int right)
 	using pv::view::View;
 
 	assert(_view);
-	const int y = _v_offset - _view->v_offset();
 
 	const QSizeF label_size(
 		_text_size.width() + View::LabelPadding.width() * 2,
@@ -194,9 +235,31 @@ QRectF Trace::get_label_rect(int right)
 	const float label_arrow_length = label_size.height() / 2;
 	return QRectF(
 		right - label_arrow_length - label_size.width() - 0.5,
-		y + 0.5f - label_size.height() / 2,
+		get_y() + 0.5f - label_size.height() / 2,
 		label_size.width(), label_size.height());
 }
 
+void Trace::on_action_set_name_triggered()
+{
+	bool ok = false;
+
+	const QString new_label = QInputDialog::getText(_context_parent,
+		tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(),
+		&ok);
+
+	if (ok)
+		set_name(new_label);
+}
+
+void Trace::on_action_set_colour_triggered()
+{
+	const QColor new_colour = QColorDialog::getColor(
+		get_colour(), _context_parent, tr("Set Colour"));
+
+	if (new_colour.isValid())
+		set_colour(new_colour);
+}
+
+
 } // namespace view
 } // namespace pv