Added missing includes and defintions

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 446814edc5fc4257b1cdf74f71d0ded15b5663ba..1f00477a2012d9cb5a3a8e11f6cd046ff62f8682 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,6 +24,8 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
 
 #include "signal.h"
 #include "view.h"
@@ -48,32 +50,15 @@ const char *const ProbeNames[] = {
        "SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
+Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
        Trace(session, probe->name),
        _probe(probe),
-       _name_action(NULL),
        _name_widget(NULL),
        _updating_name_widget(false)
 {
        assert(_probe);
 }
 
-void Signal::init_context_bar_actions(QWidget *parent)
-{
-       _name_widget = new QComboBox(parent);
-       _name_widget->setEditable(true);
-
-       _name_action = new QWidgetAction(parent);
-       _name_action->setDefaultWidget(_name_widget);
-
-       for(unsigned int i = 0; i < countof(ProbeNames); i++)
-               _name_widget->insertItem(i, ProbeNames[i]);
-       _name_widget->setEditText(_probe->name);
-
-       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
-               this, SLOT(on_text_changed(const QString&)));
-}
-
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
@@ -87,6 +72,12 @@ bool Signal::enabled() const
        return _probe->enabled;
 }
 
+void Signal::enable(bool enable)
+{
+       _probe->enabled = enable;
+       visibility_changed();
+}
+
 const sr_probe* Signal::probe() const
 {
        return _probe;
@@ -105,12 +96,32 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
                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