X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=aee214168aed2261b302dea197adcd0a7f65674a;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hp=9b08336e3c64cc627f2e919a8a8b000383253017;hpb=931f20b0dbd480153611493f51fee68f9d29be74;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 9b08336..aee2141 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -31,8 +31,6 @@
 namespace pv {
 namespace view {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
 const char *const ProbeNames[] = {
 	"CLK",
 	"DATA",
@@ -50,31 +48,20 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
+Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
 	Trace(session, probe->name),
 	_probe(probe),
-	_name_action(NULL),
-	_name_widget(),
+	_name_widget(NULL),
 	_updating_name_widget(false)
 {
 	assert(_probe);
-
-	_name_action.setDefaultWidget(&_name_widget);
-
-	_name_widget.setEditable(true);
-	for(unsigned int i = 0; i < countof(ProbeNames); i++)
-		_name_widget.insertItem(i, ProbeNames[i]);
-	_name_widget.setEditText(probe->name);
-
-	connect(&_name_widget, SIGNAL(editTextChanged(const QString&)),
-		this, SLOT(on_text_changed(const QString&)));
 }
 
 void Signal::set_name(QString name)
 {
 	Trace::set_name(name);
 	_updating_name_widget = true;
-	_name_widget.setEditText(name);
+	_name_widget->setEditText(name);
 	_updating_name_widget = false;
 }
 
@@ -83,16 +70,32 @@ bool Signal::enabled() const
 	return _probe->enabled;
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+void Signal::enable(bool enable)
 {
-	p.setPen(SignalAxisPen);
-	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+	_probe->enabled = enable;
+	visibility_changed();
 }
 
-void Signal::on_text_changed(const QString &text)
+const sr_probe* Signal::probe() const
 {
-	Trace::set_name(text);
-	text_changed();
+	return _probe;
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	_name_widget = new QComboBox(parent);
+	_name_widget->setEditable(true);
+
+	for(unsigned int i = 0; i < countof(ProbeNames); i++)
+		_name_widget->insertItem(i, ProbeNames[i]);
+	_name_widget->setEditText(_probe->name);
+
+	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+		this, SLOT(on_text_changed(const QString&)));
+
+	form->addRow(tr("Name"), _name_widget);
+
+	add_colour_option(parent, form);
 }
 
 } // namespace view