X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=16ebc74d24a890f70f8ca3f5bf0d8b1335506f5b;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=8ca5130b05430217097e9caad33886b093478d84;hpb=b9b7854ed5101148ba0a0d64a29708f804537a6c;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 8ca5130..16ebc74 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -25,22 +25,23 @@
 
 #include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
 
 #include "signal.h"
 #include "view.h"
 
-#include <pv/device/devinst.h>
-
 using std::shared_ptr;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
 	"IN",
@@ -57,15 +58,13 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_channel *const probe) :
-	Trace(probe->name),
-	_dev_inst(dev_inst),
-	_probe(probe),
+Signal::Signal(shared_ptr<Channel> channel) :
+	Trace(channel->name().c_str()),
+	_channel(channel),
 	_name_widget(NULL),
 	_updating_name_widget(false)
 {
-	assert(_probe);
+	assert(_channel);
 }
 
 void Signal::set_name(QString name)
@@ -78,30 +77,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);
+	_channel->set_enabled(enable);
 	visibility_changed();
 }
 
-const sr_channel* Signal::probe() const
+shared_ptr<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);
-	_name_widget->lineEdit()->selectAll();
-	_name_widget->setFocus();
+	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&)));