projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MarginWidget: Removed unused geometry_updated signal
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index d3e483bd8d0435ea0aea65ea3d1df0661d5e743e..56ebc7e598299f4faae507a0aea943d9401b77f1 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-20,7
+20,7
@@
#include <cassert>
#include <cassert>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.h
pp
>
#include <libsigrokdecode/libsigrokdecode.h>
#include "decoder.h"
#include <libsigrokdecode/libsigrokdecode.h>
#include "decoder.h"
@@
-66,13
+66,13
@@
void Decoder::show(bool show)
const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
Decoder::channels() const
{
const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
Decoder::channels() const
{
- return _
probe
s;
+ return _
channel
s;
}
}
-void Decoder::set_
probe
s(std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> >
probe
s)
+void Decoder::set_
channel
s(std::map<const srd_channel*,
+ std::shared_ptr<view::LogicSignal> >
channel
s)
{
{
- _
probes = probe
s;
+ _
channels = channel
s;
}
const std::map<std::string, GVariant*>& Decoder::options() const
}
const std::map<std::string, GVariant*>& Decoder::options() const
@@
-87,12
+87,12
@@
void Decoder::set_option(const char *id, GVariant *value)
_options[id] = value;
}
_options[id] = value;
}
-bool Decoder::have_required_
probe
s() const
+bool Decoder::have_required_
channel
s() const
{
for (GSList *l = _decoder->channels; l; l = l->next) {
const srd_channel *const pdch = (const srd_channel*)l->data;
assert(pdch);
{
for (GSList *l = _decoder->channels; l; l = l->next) {
const srd_channel *const pdch = (const srd_channel*)l->data;
assert(pdch);
- if (_
probes.find(pdch) == _probe
s.end())
+ if (_
channels.find(pdch) == _channel
s.end())
return false;
}
return false;
}
@@
-102,7
+102,7
@@
bool Decoder::have_required_probes() const
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
- for(auto i = _
probes.cbegin(); i != _probe
s.cend(); i++) {
+ for(auto i = _
channels.cbegin(); i != _channel
s.cend(); i++) {
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
@@
-131,20
+131,20
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
if(!decoder_inst)
return NULL;
if(!decoder_inst)
return NULL;
- // Setup the
probe
s
- GHashTable *const
probe
s = g_hash_table_new_full(g_str_hash,
+ // Setup the
channel
s
+ GHashTable *const
channel
s = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(auto i = _
probes.cbegin(); i != _probe
s.cend(); i++)
+ for(auto i = _
channels.cbegin(); i != _channel
s.cend(); i++)
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(
- signal->
probe()->index
);
+ signal->
channel()->index()
);
g_variant_ref_sink(gvar);
g_variant_ref_sink(gvar);
- g_hash_table_insert(
probe
s, (*i).first->id, gvar);
+ g_hash_table_insert(
channel
s, (*i).first->id, gvar);
}
}
- srd_inst_channel_set_all(decoder_inst,
probe
s, unit_size);
+ srd_inst_channel_set_all(decoder_inst,
channel
s, unit_size);
return decoder_inst;
}
return decoder_inst;
}