X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=dad8f1edc6f106af051b82665b14350ab1542a08;hp=916801c97eceb17c67ec8c54c423065b0f73ab42;hb=f9abacf20c85333a3a6be785049e7658967e3104;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 916801c9..dad8f1ed 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -31,8 +31,8 @@
 
 #include <libsigrok/libsigrok.hpp>
 
-#include "signal.h"
-#include "view.h"
+#include "signal.hpp"
+#include "view.hpp"
 
 using std::shared_ptr;
 
@@ -47,8 +47,8 @@ const char *const ChannelNames[] = {
 	"IN",
 	"OUT",
 	"RST",
-	"Tx",
-	"Rx",
+	"TX",
+	"RX",
 	"EN",
 	"SCLK",
 	"MOSI",
@@ -58,9 +58,9 @@ const char *const ChannelNames[] = {
 	"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),
@@ -75,6 +75,10 @@ void Signal::set_name(QString name)
 	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