Signal: Added a reference to _session

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 7c4a11e03eee9fc1082578d7ffa71a2d05563b5f..fab76fcfd1f1fcbf593d3cb853eff457ba70f8cb 100644 (file)
--- 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, const 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,33 +79,69 @@ void Signal::set_name(QString name)
 
 bool Signal::enabled() const
 {
-       return _probe->enabled;
+       return _channel->enabled();
+}
+
+void Signal::enable(bool 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&)));
 
        form->addRow(tr("Name"), _name_widget);
+
+       add_colour_option(parent, form);
+}
+
+QMenu* Signal::create_context_menu(QWidget *parent)
+{
+       QMenu *const menu = Trace::create_context_menu(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_text_changed(const QString &text)
+void Signal::on_disable()
 {
-       Trace::set_name(text);
-       text_changed();
+       enable(false);
 }
 
 } // namespace view