X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=48b400d1081d843bff33859ae0b5c6570adecd3c;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=8ca55900b47c8002861a8bacbafdba403e366a9c;hpb=5ed1adf555e0f0fb36d5b4b36f2be17745b5c8ae;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 8ca5590..48b400d 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,10 +24,18 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.h>
 
 #include "signal.h"
 #include "view.h"
 
+#include <pv/device/devinst.h>
+
+using std::shared_ptr;
+
 namespace pv {
 namespace view {
 
@@ -48,8 +56,10 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
-	Trace(session, probe->name),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const probe) :
+	Trace(probe->name),
+	_dev_inst(dev_inst),
 	_probe(probe),
 	_name_widget(NULL),
 	_updating_name_widget(false)
@@ -72,11 +82,11 @@ bool Signal::enabled() const
 
 void Signal::enable(bool enable)
 {
-	_probe->enabled = enable;
+	_dev_inst->enable_probe(_probe, enable);
 	visibility_changed();
 }
 
-const sr_probe* Signal::probe() const
+const sr_channel* Signal::probe() const
 {
 	return _probe;
 }
@@ -105,6 +115,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);