Added LogicSignal::get_data

[pulseview.git] / pv / data / decode / decoder.cpp

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index b293cacb010790c61f46edef34c7f81f0306abfe..89d19b3ad7c3ec80dd3c6d2c4f7c73d0f2d5038d 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -26,6 +26,7 @@
 #include <pv/view/logicsignal.h>
 
 using boost::shared_ptr;
+using std::set;
 using std::map;
 using std::string;
 
@@ -97,8 +98,22 @@ bool Decoder::have_required_probes() const
        return true;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(
-       srd_session *const session) const
+set< shared_ptr<pv::data::Logic> > Decoder::get_data()
+{
+       set< shared_ptr<pv::data::Logic> > data;
+       for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
+               const_iterator i = _probes.begin();
+               i != _probes.end(); i++)
+       {
+               shared_ptr<view::LogicSignal> signal((*i).second);
+               assert(signal);
+               data.insert(signal->logic_data());
+       }
+
+       return data;
+}
+
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
 {
        GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
@@ -134,7 +149,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(
                g_hash_table_insert(probes, (*i).first->id, gvar);
        }
 
-       srd_inst_probe_set_all(decoder_inst, probes);
+       srd_inst_probe_set_all(decoder_inst, probes, unit_size);
 
        return decoder_inst;
 }