projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for 'probe_group' -> 'channel_group' rename in libsigrok.
[pulseview.git]
/
pv
/
popups
/
probes.cpp
diff --git
a/pv/popups/probes.cpp
b/pv/popups/probes.cpp
index 13380c2dfb9d6999bcb23e4fb040aed39a0cd127..2e1e59249b746b3cc86adc50a1e9e6b2af4708f0 100644
(file)
--- a/
pv/popups/probes.cpp
+++ b/
pv/popups/probes.cpp
@@
-68,11
+68,11
@@
Probes::Probes(SigSession &session, QWidget *parent) :
BOOST_FOREACH(const shared_ptr<Signal> &sig, sigs)
signal_map[sig->probe()] = sig;
BOOST_FOREACH(const shared_ptr<Signal> &sig, sigs)
signal_map[sig->probe()] = sig;
- // Populate
probe
groups
- for (const GSList *g = sdi->
probe
_groups; g; g = g->next)
+ // Populate
channel
groups
+ for (const GSList *g = sdi->
channel
_groups; g; g = g->next)
{
{
- const sr_
probe
_group *const group =
- (const sr_
probe
_group*)g->data;
+ const sr_
channel
_group *const group =
+ (const sr_
channel
_group*)g->data;
assert(group);
// Make a set of signals, and removed this signals from the
assert(group);
// Make a set of signals, and removed this signals from the
@@
-148,7
+148,7
@@
void Probes::set_all_probes(bool set)
_updating_probes = false;
}
_updating_probes = false;
}
-void Probes::populate_group(const sr_
probe
_group *group,
+void Probes::populate_group(const sr_
channel
_group *group,
const vector< shared_ptr<pv::view::Signal> > sigs)
{
using pv::prop::binding::DeviceOptions;
const vector< shared_ptr<pv::view::Signal> > sigs)
{
using pv::prop::binding::DeviceOptions;
@@
-167,12
+167,12
@@
void Probes::populate_group(const sr_probe_group *group,
_layout.addRow(new QLabel(
QString("<h3>%1</h3>").arg(group->name)));
_layout.addRow(new QLabel(
QString("<h3>%1</h3>").arg(group->name)));
- // Create the
probe
group grid
+ // Create the
channel
group grid
QGridLayout *const probe_grid =
QGridLayout *const probe_grid =
- create_
probe
_group_grid(sigs);
+ create_
channel
_group_grid(sigs);
_layout.addRow(probe_grid);
_layout.addRow(probe_grid);
- // Create the
probe
group options
+ // Create the
channel
group options
if (binding)
{
binding->add_properties_to_form(&_layout, true);
if (binding)
{
binding->add_properties_to_form(&_layout, true);
@@
-180,7
+180,7
@@
void Probes::populate_group(const sr_probe_group *group,
}
}
}
}
-QGridLayout* Probes::create_
probe
_group_grid(
+QGridLayout* Probes::create_
channel
_group_grid(
const vector< shared_ptr<pv::view::Signal> > sigs)
{
int row = 0, col = 0;
const vector< shared_ptr<pv::view::Signal> > sigs)
{
int row = 0, col = 0;