X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=ab1426e0ed08d548e11157cfb074971c422e00f2;hb=c0f868521a211747f89ef217ae63404f373d952b;hp=ae180e19a47a228a35f8d1151658b3f1b14973c2;hpb=d09674d4529828b6bd2cbaa027949b953d6bd96a;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ae180e1..ab1426e 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -35,12 +35,43 @@ const int Signal::LabelHitPadding = 2;
 
 const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
 
-Signal::Signal(const sr_probe *const probe) :
+const char *const ProbeNames[] = {
+	"CLK",
+	"DATA",
+	"IN",
+	"OUT",
+	"RST",
+	"Tx",
+	"Rx",
+	"EN",
+	"SCLK",
+	"MOSI",
+	"MISO",
+	"/SS",
+	"SDA",
+	"SCL"
+};
+
+Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
+	_session(session),
 	_probe(probe),
 	_name(probe->name),
-	_v_offset(0)
+	_v_offset(0),
+	_name_action(NULL),
+	_name_widget(),
+	_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&)));
 }
 
 QString Signal::get_name() const
@@ -51,6 +82,9 @@ QString Signal::get_name() const
 void Signal::set_name(QString name)
 {
 	_name = name;
+	_updating_name_widget = true;
+	_name_widget.setEditText(name);
+	_updating_name_widget = false;
 }
 
 QColor Signal::get_colour() const
@@ -165,5 +199,11 @@ QRectF Signal::get_label_rect(int y, int right)
 		label_size.width(), label_size.height());
 }
 
+void Signal::on_text_changed(const QString &text)
+{
+	_name = text;
+	text_changed();
+}
+
 } // namespace view
 } // namespace pv