X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=916801c97eceb17c67ec8c54c423065b0f73ab42;hp=44341aeab5cfa406dd3fa65390169907e2089248;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=86e823cab6eaa244e9d12d0fb2809b5733687368

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 44341aea..916801c9 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,52 +58,66 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
-	Trace(session, probe->name),
-	_probe(probe),
-	_name_widget(NULL),
-	_updating_name_widget(false)
+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)
 {
 	Trace::set_name(name);
-	_updating_name_widget = true;
-	_name_widget->setEditText(name);
-	_updating_name_widget = false;
+	updating_name_widget_ = true;
+	name_widget_->setEditText(name);
+	updating_name_widget_ = false;
 }
 
 bool Signal::enabled() const
 {
-	return _probe->enabled;
+	return channel_->enabled();
 }
 
 void Signal::enable(bool enable)
 {
-	_probe->enabled = enable;
-	visibility_changed();
+	channel_->set_enabled(enable);
+
+	if (owner_)
+		owner_->extents_changed(true, true);
 }
 
-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)
 {
-	_name_widget = new QComboBox(parent);
-	_name_widget->setEditable(true);
+	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]);
 
-	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+	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&)));
 
-	form->addRow(tr("Name"), _name_widget);
+	form->addRow(tr("Name"), name_widget_);
 
 	add_colour_option(parent, form);
 }
@@ -105,12 +129,18 @@ 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);
 
 	return menu;
 }
 
+void Signal::delete_pressed()
+{
+	on_disable();
+}
+
 void Signal::on_disable()
 {
 	enable(false);