Rename 'probe' to 'channel' (libsigrokdecode change).

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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 77f91cc3a3511d637b3976339ea6f07e453f2915..44e474b942c4bfbd82281b42c8d7d909b7430d6f 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -18,14 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrok/libsigrok.h>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.h"
 
 #include <pv/view/logicsignal.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::set;
+using std::map;
+using std::string;
 
 namespace pv {
 namespace data {
@@ -33,14 +36,15 @@ namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
        _decoder(dec),
-       _options(g_hash_table_new_full(g_str_hash,
-               g_str_equal, g_free, (GDestroyNotify)g_variant_unref))
+       _shown(true)
 {
 }
 
 Decoder::~Decoder()
 {
-       g_hash_table_destroy(_options);
+       for (map<string, GVariant*>::const_iterator i = _options.begin();
+               i != _options.end(); i++)
+               g_variant_unref((*i).second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -48,35 +52,85 @@ const srd_decoder* Decoder::decoder() const
        return _decoder;
 }
 
-const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
-Decoder::probes() const
+bool Decoder::shown() const
+{
+       return _shown;
+}
+
+void Decoder::show(bool show)
+{
+       _shown = show;
+}
+
+const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+Decoder::channels() const
 {
        return _probes;
 }
 
-void Decoder::set_probes(std::map<const srd_probe*,
+void Decoder::set_probes(std::map<const srd_channel*,
        boost::shared_ptr<view::LogicSignal> > probes)
 {
        _probes = probes;
 }
 
-const GHashTable* Decoder::options() const
+const std::map<std::string, GVariant*>& Decoder::options() const
 {
        return _options;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {
+       assert(value);
        g_variant_ref(value);
-       g_hash_table_replace(_options, (void*)g_strdup(id), value);
+       _options[id] = value;
+}
+
+bool Decoder::have_required_probes() const
+{
+       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) == _probes.end())
+                       return false;
+       }
+
+       return true;
+}
+
+set< shared_ptr<pv::data::Logic> > Decoder::get_data()
+{
+       set< shared_ptr<pv::data::Logic> > data;
+       for(map<const srd_channel*, 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 *const session) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
 {
-       // Create the decoder instance
+       GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
+               g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+       for (map<string, GVariant*>::const_iterator i = _options.begin();
+               i != _options.end(); i++)
+       {
+               GVariant *const value = (*i).second;
+               g_variant_ref(value);
+               g_hash_table_replace(opt_hash, (void*)g_strdup(
+                       (*i).first.c_str()), value);
+       }
+
        srd_decoder_inst *const decoder_inst = srd_inst_new(
-               session, _decoder->id, _options);
+               session, _decoder->id, opt_hash);
+       g_hash_table_destroy(opt_hash);
+
        if(!decoder_inst)
                return NULL;
 
@@ -84,7 +138,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(
        GHashTable *const probes = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
+       for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
                const_iterator i = _probes.begin();
                i != _probes.end(); i++)
        {
@@ -95,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_channel_set_all(decoder_inst, probes, unit_size);
 
        return decoder_inst;
 }