Moved all sr_probe modification into pv::DevInst

[pulseview.git] / pv / view / signal.cpp

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 8ca55900b47c8002861a8bacbafdba403e366a9c..61f79a8c8351e8574ceabf779324f8d733195a96 100644 (file)
--- 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/devinst.h>
+
+using boost::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::DevInst> dev_inst,
+       const sr_probe *const probe) :
+       Trace(probe->name),
+       _dev_inst(dev_inst),
        _probe(probe),
        _name_widget(NULL),
        _updating_name_widget(false)
@@ -72,7 +82,7 @@ bool Signal::enabled() const
 
 void Signal::enable(bool enable)
 {
-       _probe->enabled = enable;
+       _dev_inst->enable_probe(_probe, enable);
        visibility_changed();
 }
 
@@ -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);