X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=fab76fcfd1f1fcbf593d3cb853eff457ba70f8cb;hp=48b400d1081d843bff33859ae0b5c6570adecd3c;hb=b86aa8f4a22857a90bbfca6e7993b2deaf1157d4;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 48b400d1..fab76fcf 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -25,21 +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",
@@ -56,15 +58,15 @@ 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(pv::SigSession &session,
+	std::shared_ptr<sigrok::Channel> channel) :
+	Trace(channel->name().c_str()),
+	_session(session),
+	_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);
+	_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);
+	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&)));