Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 51af899ee4d814d8703e92c33ebfe135142cd6ad..916801c97eceb17c67ec8c54c423065b0f73ab42 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -29,15 +29,15 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
 
 #include "signal.h"
 #include "view.h"
 
-#include <pv/device/devinst.h>
-
 using std::shared_ptr;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
@@ -58,67 +58,66 @@ const char *const ChannelNames[] = {
        "SCL"
 };
 
-Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
-       const sr_channel *const channel) :
-       Trace(channel->name),
-       _dev_inst(dev_inst),
-       _channel(channel),
-       _name_widget(NULL),
-       _updating_name_widget(false)
+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(_channel);
+       assert(channel_);
 }
 
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
-       _updating_name_widget = true;
-       _name_widget->setEditText(name);
-       _updating_name_widget = false;
+       updating_name_widget_ = true;
+       name_widget_->setEditText(name);
+       updating_name_widget_ = false;
 }
 
 bool Signal::enabled() const
 {
-       return _channel->enabled;
+       return channel_->enabled();
 }
 
 void Signal::enable(bool enable)
 {
-       _dev_inst->enable_channel(_channel, enable);
-       visibility_changed();
+       channel_->set_enabled(enable);
+
+       if (owner_)
+               owner_->extents_changed(true, true);
 }
 
-const sr_channel* Signal::channel() const
+shared_ptr<Channel> Signal::channel() const
 {
-       return _channel;
+       return channel_;
 }
 
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        int index;
 
-       _name_widget = new QComboBox(parent);
-       _name_widget->setEditable(true);
+       name_widget_ = new QComboBox(parent);
+       name_widget_->setEditable(true);
 
        for(unsigned int i = 0; i < countof(ChannelNames); i++)
-               _name_widget->insertItem(i, ChannelNames[i]);
+               name_widget_->insertItem(i, ChannelNames[i]);
 
-       index = _name_widget->findText(_name, Qt::MatchExactly);
+       index = name_widget_->findText(name_, Qt::MatchExactly);
 
        if (index == -1) {
-               _name_widget->insertItem(0, _name);
-               _name_widget->setCurrentIndex(0);
+               name_widget_->insertItem(0, name_);
+               name_widget_->setCurrentIndex(0);
        } else {
-               _name_widget->setCurrentIndex(index);
+               name_widget_->setCurrentIndex(index);
        }
 
-       _name_widget->lineEdit()->selectAll();
-       _name_widget->setFocus();
-
-       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+       connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
                this, SLOT(on_text_changed(const QString&)));
 
-       form->addRow(tr("Name"), _name_widget);
+       form->addRow(tr("Name"), name_widget_);
 
        add_colour_option(parent, form);
 }