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' -> 'channel' rename in libsigrok.
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 52cf4ac1ab24af7ae09051d4c30ec93e36b3c819..0b4426475d6e52a36e7f87f96a58933e144a903c 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-64,7
+64,7
@@
const QColor LogicSignal::SignalColours[10] = {
};
LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
};
LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_
probe
*const probe, shared_ptr<data::Logic> data) :
+ const sr_
channel
*const probe, shared_ptr<data::Logic> data) :
Signal(dev_inst, probe),
_data(data),
_trigger_none(NULL),
Signal(dev_inst, probe),
_data(data),
_trigger_none(NULL),
@@
-306,7
+306,7
@@
void LogicSignal::set_trigger(char type)
const sr_dev_inst *const sdi = _dev_inst->dev_inst();
assert(sdi);
const sr_dev_inst *const sdi = _dev_inst->dev_inst();
assert(sdi);
- const int probe_count = g_slist_length(sdi->
probe
s);
+ const int probe_count = g_slist_length(sdi->
channel
s);
assert(probe_count > 0);
assert(_probe && _probe->index < probe_count);
assert(probe_count > 0);
assert(_probe && _probe->index < probe_count);