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 9b08336e3c64cc627f2e919a8a8b000383253017..61f79a8c8351e8574ceabf779324f8d733195a96 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,15 +24,21 @@
 #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 {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
 const char *const ProbeNames[] = {
        "CLK",
        "DATA",
@@ -50,31 +56,22 @@ const char *const ProbeNames[] = {
        "SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const 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_action(NULL),
-       _name_widget(),
+       _name_widget(NULL),
        _updating_name_widget(false)
 {
        assert(_probe);
-
-       _name_action.setDefaultWidget(&_name_widget);
-
-       _name_widget.setEditable(true);
-       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);
        _updating_name_widget = true;
-       _name_widget.setEditText(name);
+       _name_widget->setEditText(name);
        _updating_name_widget = false;
 }
 
@@ -83,16 +80,56 @@ bool Signal::enabled() const
        return _probe->enabled;
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+void Signal::enable(bool enable)
+{
+       _dev_inst->enable_probe(_probe, enable);
+       visibility_changed();
+}
+
+const sr_probe* Signal::probe() const
+{
+       return _probe;
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       _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);
+
+       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()
 {
-       p.setPen(SignalAxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+       on_disable();
 }
 
-void Signal::on_text_changed(const QString &text)
+void Signal::on_disable()
 {
-       Trace::set_name(text);
-       text_changed();
+       enable(false);
 }
 
 } // namespace view