X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=fab76fcfd1f1fcbf593d3cb853eff457ba70f8cb;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=8ca55900b47c8002861a8bacbafdba403e366a9c;hpb=5ed1adf555e0f0fb36d5b4b36f2be17745b5c8ae;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 8ca55900..fab76fcf 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,14 +24,24 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.hpp>
 
 #include "signal.h"
 #include "view.h"
 
+using std::shared_ptr;
+
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
 	"IN",
@@ -48,13 +58,15 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
-	Trace(session, probe->name),
-	_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)
@@ -67,28 +79,38 @@ void Signal::set_name(QString name)
 
 bool Signal::enabled() const
 {
-	return _probe->enabled;
+	return _channel->enabled();
 }
 
 void Signal::enable(bool enable)
 {
-	_probe->enabled = enable;
+	_channel->set_enabled(enable);
 	visibility_changed();
 }
 
-const sr_probe* 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&)));
@@ -105,6 +127,7 @@ QMenu* Signal::create_context_menu(QWidget *parent)
 	menu->addSeparator();
 
 	QAction *const disable = new QAction(tr("Disable"), this);
+	disable->setShortcuts(QKeySequence::Delete);
 	connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
 	menu->addAction(disable);