projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 2ee4b1850ded6f36e18b817df0482d0bd9bba431..97e05494cca05eac922a47a6bb0c1dd878472d93 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-41,7
+41,7
@@
using std::shared_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
-const char *const
Probe
Names[] = {
+const char *const
Channel
Names[] = {
"CLK",
"DATA",
"IN",
"CLK",
"DATA",
"IN",
@@
-59,14
+59,14
@@
const char *const ProbeNames[] = {
};
Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
};
Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_channel *const
probe
) :
- Trace(
probe
->name),
+ const sr_channel *const
channel
) :
+ Trace(
channel
->name),
_dev_inst(dev_inst),
_dev_inst(dev_inst),
- _
probe(probe
),
+ _
channel(channel
),
_name_widget(NULL),
_updating_name_widget(false)
{
_name_widget(NULL),
_updating_name_widget(false)
{
- assert(_
probe
);
+ assert(_
channel
);
}
void Signal::set_name(QString name)
}
void Signal::set_name(QString name)
@@
-79,18
+79,18
@@
void Signal::set_name(QString name)
bool Signal::enabled() const
{
bool Signal::enabled() const
{
- return _
probe
->enabled;
+ return _
channel
->enabled;
}
void Signal::enable(bool enable)
{
}
void Signal::enable(bool enable)
{
- _dev_inst->enable_
probe(_probe
, enable);
+ _dev_inst->enable_
channel(_channel
, enable);
visibility_changed();
}
visibility_changed();
}
-const sr_channel* Signal::
probe
() const
+const sr_channel* Signal::
channel
() const
{
{
- return _
probe
;
+ return _
channel
;
}
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
}
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
@@
-100,8
+100,8
@@
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
_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(
Probe
Names); i++)
- _name_widget->insertItem(i,
Probe
Names[i]);
+ for(unsigned int i = 0; i < countof(
Channel
Names); i++)
+ _name_widget->insertItem(i,
Channel
Names[i]);
index = _name_widget->findText(_name, Qt::MatchExactly);
index = _name_widget->findText(_name, Qt::MatchExactly);