X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=d06c24b5e63ed98d98a7f190851ed2667f9d5ccc;hb=f3f98f8fade1cffb28161da2710dfc9def5e6d74;hp=67ea3a02788416c670a6c1d3f12d591d402df84d;hpb=9b6378f147671e62f57887d51d01864d20e01475;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 67ea3a02..d06c24b5 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,12 +23,15 @@
 #include <assert.h>
 #include <math.h>
 
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QFormLayout>
+#include <QLineEdit>
 
 #include "trace.h"
+#include "tracepalette.h"
 #include "view.h"
 
+#include <pv/widgets/colourbutton.h>
+
 namespace pv {
 namespace view {
 
@@ -38,7 +41,9 @@ const int Trace::LabelHitPadding = 2;
 Trace::Trace(pv::SigSession &session, QString name) :
 	_session(session),
 	_name(name),
-	_v_offset(0)
+	_v_offset(0),
+	_popup(NULL),
+	_popup_form(NULL)
 {
 }
 
@@ -83,6 +88,8 @@ void Trace::paint_back(QPainter &p, int left, int right)
 	(void)p;
 	(void)left;
 	(void)right;
+
+	compute_text_size(p);
 }
 
 void Trace::paint_mid(QPainter &p, int left, int right)
@@ -170,17 +177,21 @@ 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);
+	return menu;
+}
 
-	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);
+pv::widgets::Popup* Trace::create_popup(QWidget *parent)
+{
+	using pv::widgets::Popup;
 
-	return menu;
+	_popup = new Popup(parent);
+
+	create_popup_form();
+
+	connect(_popup, SIGNAL(closed()),
+		this, SLOT(on_popup_closed()));
+
+	return _popup;
 }
 
 int Trace::get_y() const
@@ -199,6 +210,47 @@ 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::create_popup_form()
+{
+	// Clear the layout
+
+	// Transfer the layout and the child widgets to a temporary widget
+	// which then goes out of scope destroying the layout and all the child
+	// widgets.
+	if (_popup_form)
+		QWidget().setLayout(_popup_form);
+
+	// Repopulate the popup
+	_popup_form = new QFormLayout(_popup);
+	_popup->setLayout(_popup_form);
+	populate_popup_form(_popup, _popup_form);
+}
+
+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(
@@ -211,7 +263,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,
@@ -219,31 +270,27 @@ 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()
+void Trace::on_popup_closed()
 {
-	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);
+	_popup = NULL;
+	_popup_form = NULL;
 }
 
-void Trace::on_action_set_colour_triggered()
+void Trace::on_text_changed(const QString &text)
 {
-	const QColor new_colour = QColorDialog::getColor(
-		get_colour(), _context_parent, tr("Set Colour"));
-
-	if (new_colour.isValid())
-		set_colour(new_colour);
+	set_name(text);
+	text_changed();
 }
 
+void Trace::on_colour_changed(const QColor &colour)
+{
+	set_colour(colour);
+	colour_changed();
+}
 
 } // namespace view
 } // namespace pv