projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Trace::channel_ to Trace::base_, including dependencies
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index fc90eba1fcd11cf6f5b5d0e132895304b8cbc9f9..a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-67,7
+67,7
@@
Signal::Signal(pv::Session &session,
items_({scale_handle_}),
name_widget_(nullptr)
{
items_({scale_handle_}),
name_widget_(nullptr)
{
- assert(
channel
_);
+ assert(
base
_);
}
void Signal::set_name(QString name)
}
void Signal::set_name(QString name)
@@
-80,20
+80,20
@@
void Signal::set_name(QString name)
bool Signal::enabled() const
{
bool Signal::enabled() const
{
- return
channel
_->enabled();
+ return
base
_->enabled();
}
void Signal::enable(bool enable)
{
}
void Signal::enable(bool enable)
{
-
channel
_->set_enabled(enable);
+
base
_->set_enabled(enable);
if (owner_)
owner_->extents_changed(true, true);
}
if (owner_)
owner_->extents_changed(true, true);
}
-shared_ptr<data::SignalBase> Signal::
channel
() const
+shared_ptr<data::SignalBase> Signal::
base
() const
{
{
- return
channel
_;
+ return
base
_;
}
const ViewItemOwner::item_list& Signal::child_items() const
}
const ViewItemOwner::item_list& Signal::child_items() const
@@
-103,7
+103,7
@@
const ViewItemOwner::item_list& Signal::child_items() const
void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- if (
channel
_->enabled())
+ if (
base
_->enabled())
Trace::paint_back(p, pp);
}
Trace::paint_back(p, pp);
}
@@
-116,10
+116,10
@@
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
for (unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
for (unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
- const int index = name_widget_->findText(
channel
_->name(), Qt::MatchExactly);
+ const int index = name_widget_->findText(
base
_->name(), Qt::MatchExactly);
if (index == -1) {
if (index == -1) {
- name_widget_->insertItem(0,
channel
_->name());
+ name_widget_->insertItem(0,
base
_->name());
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);