X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=de036a941820dd256a1429f1545175cada6058de;hp=b3ebd95b4a7e1928b1c33370f39a1cf8506a3f86;hb=91e8bf08c9799cb1041d26bf2ff6b67abf9a420b;hpb=410f9c81240bda322c0b9880170f0eb7a2bb7338

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index b3ebd95b..de036a94 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,9 +23,15 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QColorDialog>
+#include <QInputDialog>
+
 #include "trace.h"
+#include "tracepalette.h"
 #include "view.h"
 
+#include <pv/widgets/colourbutton.h>
+
 namespace pv {
 namespace view {
 
@@ -163,6 +169,33 @@ 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();
@@ -179,6 +212,31 @@ void Trace::paint_axis(QPainter &p, int y, int left, int right)
 	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
 }
 
+void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
+{
+	using pv::widgets::ColourButton;
+
+	ColourButton *const colour_button = new ColourButton(
+		TracePalette::Rows, TracePalette::Cols, parent);
+	colour_button->set_palette(TracePalette::Colours);
+	colour_button->set_colour(_colour);
+	connect(colour_button, SIGNAL(selected(const QColor&)),
+		this, SLOT(on_colour_changed(const QColor&)));
+
+	form->addRow(tr("Colour"), colour_button);
+}
+
+void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	QLineEdit *const name_edit = new QLineEdit(parent);
+	name_edit->setText(_name);
+	connect(name_edit, SIGNAL(textChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
+	form->addRow(tr("Name"), name_edit);
+
+	add_colour_option(parent, form);
+}
+
 void Trace::compute_text_size(QPainter &p)
 {
 	_text_size = QSize(
@@ -191,7 +249,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,
@@ -199,9 +256,42 @@ 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);
+}
+
+void Trace::on_text_changed(const QString &text)
+{
+	set_name(text);
+	text_changed();
+}
+
+void Trace::on_colour_changed(const QColor &colour)
+{
+	set_colour(colour);
+	colour_changed();
+}
+
 } // namespace view
 } // namespace pv