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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 51af899..16ebc74 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -29,15 +29,15 @@
 #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 {
 
@@ -58,10 +58,8 @@ const char *const ChannelNames[] = {
 	"SCL"
 };
 
-Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_channel *const channel) :
-	Trace(channel->name),
-	_dev_inst(dev_inst),
+Signal::Signal(shared_ptr<Channel> channel) :
+	Trace(channel->name().c_str()),
 	_channel(channel),
 	_name_widget(NULL),
 	_updating_name_widget(false)
@@ -79,16 +77,16 @@ void Signal::set_name(QString name)
 
 bool Signal::enabled() const
 {
-	return _channel->enabled;
+	return _channel->enabled();
 }
 
 void Signal::enable(bool enable)
 {
-	_dev_inst->enable_channel(_channel, enable);
+	_channel->set_enabled(enable);
 	visibility_changed();
 }
 
-const sr_channel* Signal::channel() const
+shared_ptr<Channel> Signal::channel() const
 {
 	return _channel;
 }
@@ -112,9 +110,6 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 		_name_widget->setCurrentIndex(index);
 	}
 
-	_name_widget->lineEdit()->selectAll();
-	_name_widget->setFocus();
-
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));