projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5be76b1
)
Fixed decoder probes auto-select logic
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 8 Feb 2014 10:04:51 +0000
(10:04 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 8 Feb 2014 13:53:09 +0000
(13:53 +0000)
This fixes bug #310
pv/sigsession.cpp
patch
|
blob
|
history
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 6f66be7c586be3958b6b08290829264e401997c3..e507a09946801fa0c081d8ecfecb18ba6806c946 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-233,10
+233,15
@@
bool SigSession::add_decoder(srd_decoder *const dec)
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(dec));
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(dec));
- // Auto select the initial probes
+ // Make a list of all the probes
+ std::vector<const srd_probe*> all_probes;
for(const GSList *i = dec->probes; i; i = i->next)
for(const GSList *i = dec->probes; i; i = i->next)
- {
- const srd_probe *const probe = (const srd_probe*)i->data;
+ all_probes.push_back((const srd_probe*)i->data);
+ for(const GSList *i = dec->opt_probes; i; i = i->next)
+ all_probes.push_back((const srd_probe*)i->data);
+
+ // Auto select the initial probes
+ BOOST_FOREACH(const srd_probe *probe, all_probes)
BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
{
shared_ptr<view::LogicSignal> l =
BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
{
shared_ptr<view::LogicSignal> l =
@@
-246,7
+251,6
@@
bool SigSession::add_decoder(srd_decoder *const dec)
l->get_name().toLower()))
probes[probe] = l;
}
l->get_name().toLower()))
probes[probe] = l;
}
- }
assert(decoder_stack);
assert(!decoder_stack->stack().empty());
assert(decoder_stack);
assert(!decoder_stack->stack().empty());