projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Added hit_box_rect
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index ecf74f08c0fc8528c94b099de5e280902891f2b6..dad8f1edc6f106af051b82665b14350ab1542a08 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-47,8
+47,8
@@
const char *const ChannelNames[] = {
"IN",
"OUT",
"RST",
"IN",
"OUT",
"RST",
- "T
x
",
- "R
x
",
+ "T
X
",
+ "R
X
",
"EN",
"SCLK",
"MOSI",
"EN",
"SCLK",
"MOSI",
@@
-60,7
+60,7
@@
const char *const ChannelNames[] = {
Signal::Signal(pv::Session &session,
std::shared_ptr<sigrok::Channel> channel) :
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),
session_(session),
channel_(channel),
name_widget_(NULL),
@@
-78,7
+78,7
@@
void Signal::set_name(QString name)
// Store the channel name in sigrok::Channel so that it
// will end up in the .sr file upon save.
// Store the channel name in sigrok::Channel so that it
// will end up in the .sr file upon save.
- channel_->set_name(name.to
StdString
());
+ channel_->set_name(name.to
Utf8().constData
());
}
bool Signal::enabled() const
}
bool Signal::enabled() const