#include <extdef.h>
#include <assert.h>
-#include <math.h>
+#include <cmath>
#include <QApplication>
#include <QFormLayout>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
-#include "signal.h"
-#include "view.h"
+#include "signal.hpp"
+#include "view.hpp"
using std::shared_ptr;
"IN",
"OUT",
"RST",
- "Tx",
- "Rx",
+ "TX",
+ "RX",
"EN",
"SCLK",
"MOSI",
"SCL"
};
-Signal::Signal(pv::SigSession &session,
+Signal::Signal(pv::Session &session,
std::shared_ptr<sigrok::Channel> channel) :
- Trace(channel->name().c_str()),
+ Trace(QString::fromUtf8(channel->name().c_str())),
session_(session),
channel_(channel),
- name_widget_(NULL),
+ name_widget_(nullptr),
updating_name_widget_(false)
{
assert(channel_);
updating_name_widget_ = true;
name_widget_->setEditText(name);
updating_name_widget_ = false;
+
+ // Store the channel name in sigrok::Channel so that it
+ // will end up in the .sr file upon save.
+ channel_->set_name(name.toUtf8().constData());
}
bool Signal::enabled() const
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
{
- int index;
-
name_widget_ = new QComboBox(parent);
name_widget_->setEditable(true);
+ name_widget_->setCompleter(0);
for(unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
- index = name_widget_->findText(name_, Qt::MatchExactly);
+ const int index = name_widget_->findText(name_, Qt::MatchExactly);
if (index == -1) {
name_widget_->insertItem(0, name_);