Apply option changes immediately, not on decode stack rebuild

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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 2a9b980b14ef58039641f22df519cb291b6acdb7..c6995bcf703a56cb13b4ba347acb2c61aa11d17e 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -19,6 +19,8 @@
 
 #include <cassert>
 
 
 #include <cassert>
 

+#include <QDebug>
+

 #include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 


@@ -28,9 +30,7 @@
 #include <pv/data/decodesignal.hpp>
 
 using pv::data::DecodeChannel;
 #include <pv/data/decodesignal.hpp>
 
 using pv::data::DecodeChannel;

-using std::set;

 using std::map;
 using std::map;

-using std::shared_ptr;

 using std::string;
 
 namespace pv {
 using std::string;
 
 namespace pv {


@@ -39,7 +39,8 @@ namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
        decoder_(dec),
 
 Decoder::Decoder(const srd_decoder *const dec) :
        decoder_(dec),

-       shown_(true)
+       shown_(true),
+       decoder_inst_(nullptr)

 {
 }
 
 {
 }
 


@@ -84,6 +85,18 @@ void Decoder::set_option(const char *id, GVariant *value)
        assert(value);
        g_variant_ref(value);
        options_[id] = value;
        assert(value);
        g_variant_ref(value);
        options_[id] = value;

+
+       // If we have a decoder instance, apply option value immediately
+       if (decoder_inst_) {
+               GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
+                       g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+               g_variant_ref(value);
+               g_hash_table_insert(opt_hash, (void*)g_strdup(id), value);
+
+               srd_inst_option_set(decoder_inst_, opt_hash);
+               g_hash_table_destroy(opt_hash);
+       }

 }
 
 bool Decoder::have_required_channels() const
 }
 
 bool Decoder::have_required_channels() const


@@ -95,7 +108,7 @@ bool Decoder::have_required_channels() const
        return true;
 }
 
        return true;
 }
 

-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)

 {
        GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 {
        GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);


@@ -107,15 +120,17 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
                        option.first.c_str()), value);
        }
 
                        option.first.c_str()), value);
        }
 

-       srd_decoder_inst *const decoder_inst = srd_inst_new(
-               session, decoder_->id, opt_hash);
+       if (decoder_inst_)
+               qDebug() << "WARNING: previous decoder instance" << decoder_inst_ << "exists";
+
+       decoder_inst_ = srd_inst_new(session, decoder_->id, opt_hash);

        g_hash_table_destroy(opt_hash);
 
        g_hash_table_destroy(opt_hash);
 

-       if (!decoder_inst)
+       if (!decoder_inst_)

                return nullptr;
 
        // Setup the channels
                return nullptr;
 
        // Setup the channels

-       GArray *const init_pin_states = g_array_sized_new(FALSE, TRUE,
+       GArray *const init_pin_states = g_array_sized_new(false, true,

                sizeof(uint8_t), channels_.size());
 
        g_array_set_size(init_pin_states, channels_.size());
                sizeof(uint8_t), channels_.size());
 
        g_array_set_size(init_pin_states, channels_.size());


@@ -124,20 +139,28 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
        for (DecodeChannel *ch : channels_) {
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
        for (DecodeChannel *ch : channels_) {

+               if (!ch->assigned_signal)
+                       continue;
+

                init_pin_states->data[ch->id] = ch->initial_pin_state;
 
                init_pin_states->data[ch->id] = ch->initial_pin_state;
 

-               GVariant *const gvar = g_variant_new_int32(ch->id);  // id = bit position
+               GVariant *const gvar = g_variant_new_int32(ch->bit_id);  // bit_id = bit position

                g_variant_ref_sink(gvar);
                g_variant_ref_sink(gvar);

-               // key is channel name, value is bit position in each sample
+               // key is channel name (pdch->id), value is bit position in each sample (gvar)

                g_hash_table_insert(channels, ch->pdch_->id, gvar);
        }
 
                g_hash_table_insert(channels, ch->pdch_->id, gvar);
        }
 

-       srd_inst_channel_set_all(decoder_inst, channels);
+       srd_inst_channel_set_all(decoder_inst_, channels);

 
 

-       srd_inst_initial_pins_set_all(decoder_inst, init_pin_states);
-       g_array_free(init_pin_states, TRUE);
+       srd_inst_initial_pins_set_all(decoder_inst_, init_pin_states);
+       g_array_free(init_pin_states, true);

 
 

-       return decoder_inst;
+       return decoder_inst_;
+}
+
+void Decoder::invalidate_decoder_inst()
+{
+       decoder_inst_ = nullptr;

 }
 
 }  // namespace decode
 }
 
 }  // namespace decode