X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=7df31767ea5492659dcc8e1e33ef5b0a17c9cb4c;hb=f27ee56d9c2b18158f2a9451b295123288134611;hp=61f79a8c8351e8574ceabf779324f8d733195a96;hpb=e183f4e328db8bb134652254ba9bf0707dc16c66;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 61f79a8..7df3176 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -25,6 +25,8 @@
 
 #include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
 #include <QMenu>
 
 #include <libsigrok/libsigrok.h>
@@ -32,14 +34,14 @@
 #include "signal.h"
 #include "view.h"
 
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 namespace pv {
 namespace view {
 
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
 	"IN",
@@ -56,15 +58,15 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(shared_ptr<pv::DevInst> dev_inst,
-	const sr_probe *const probe) :
-	Trace(probe->name),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const channel) :
+	Trace(channel->name),
 	_dev_inst(dev_inst),
-	_probe(probe),
+	_channel(channel),
 	_name_widget(NULL),
 	_updating_name_widget(false)
 {
-	assert(_probe);
+	assert(_channel);
 }
 
 void Signal::set_name(QString name)
@@ -77,28 +79,38 @@ void Signal::set_name(QString name)
 
 bool Signal::enabled() const
 {
-	return _probe->enabled;
+	return _channel->enabled;
 }
 
 void Signal::enable(bool enable)
 {
-	_dev_inst->enable_probe(_probe, enable);
+	_dev_inst->enable_channel(_channel, enable);
 	visibility_changed();
 }
 
-const sr_probe* Signal::probe() const
+const sr_channel* Signal::channel() const
 {
-	return _probe;
+	return _channel;
 }
 
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
+	int index;
+
 	_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);
+	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+		_name_widget->insertItem(i, ChannelNames[i]);
+
+	index = _name_widget->findText(_name, Qt::MatchExactly);
+
+	if (index == -1) {
+		_name_widget->insertItem(0, _name);
+		_name_widget->setCurrentIndex(0);
+	} else {
+		_name_widget->setCurrentIndex(index);
+	}
 
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));