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 f5fdd0c9a7361f830c6abdd9757be9b5cbe72e7b..c6995bcf703a56cb13b4ba347acb2c61aa11d17e 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,22 +14,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
 
+#include <QDebug>
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.hpp"
 
-#include <pv/view/logicsignal.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/data/decodesignal.hpp>
 
-using std::set;
+using pv::data::DecodeChannel;
 using std::map;
-using std::shared_ptr;
 using std::string;
 
 namespace pv {
@@ -38,14 +39,15 @@ namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
        decoder_(dec),
-       shown_(true)
+       shown_(true),
+       decoder_inst_(nullptr)
 {
 }
 
 Decoder::~Decoder()
 {
-       for (auto i = options_.begin(); i != options_.end(); i++)
-               g_variant_unref((*i).second);
+       for (auto& option : options_)
+               g_variant_unref(option.second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -63,19 +65,17 @@ void Decoder::show(bool show)
        shown_ = show;
 }
 
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
-Decoder::channels() const
+const vector<DecodeChannel*>& Decoder::channels() const
 {
        return channels_;
 }
 
-void Decoder::set_channels(std::map<const srd_channel*,
-       std::shared_ptr<view::LogicSignal> > channels)
+void Decoder::set_channels(vector<DecodeChannel*> channels)
 {
        channels_ = channels;
 }
 
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
 {
        return options_;
 }
@@ -85,70 +85,84 @@ void Decoder::set_option(const char *id, GVariant *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
 {
-       for (GSList *l = decoder_->channels; l; l = l->next) {
-               const srd_channel *const pdch = (const srd_channel*)l->data;
-               assert(pdch);
-               if (channels_.find(pdch) == channels_.end())
+       for (DecodeChannel *ch : channels_)
+               if (!ch->assigned_signal && !ch->is_optional)
                        return false;
-       }
 
        return true;
 }
 
-set< shared_ptr<pv::data::Logic> > Decoder::get_data()
-{
-       set< shared_ptr<pv::data::Logic> > data;
-       for (auto i = channels_.cbegin(); i != channels_.cend(); 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
+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);
 
-       for (auto i = options_.cbegin(); i != options_.cend(); i++)
-       {
-               GVariant *const value = (*i).second;
+       for (const auto& option : options_) {
+               GVariant *const value = option.second;
                g_variant_ref(value);
                g_hash_table_replace(opt_hash, (void*)g_strdup(
-                       (*i).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);
 
-       if (!decoder_inst)
+       if (!decoder_inst_)
                return nullptr;
 
        // Setup the channels
+       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());
+
        GHashTable *const channels = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for (auto i = channels_.cbegin(); i != channels_.cend(); i++)
-       {
-               shared_ptr<view::LogicSignal> signal((*i).second);
-               GVariant *const gvar = g_variant_new_int32(
-                       signal->channel()->index());
+       for (DecodeChannel *ch : channels_) {
+               if (!ch->assigned_signal)
+                       continue;
+
+               init_pin_states->data[ch->id] = ch->initial_pin_state;
+
+               GVariant *const gvar = g_variant_new_int32(ch->bit_id);  // bit_id = bit position
                g_variant_ref_sink(gvar);
-               g_hash_table_insert(channels, (*i).first->id, gvar);
+               // key is channel name (pdch->id), value is bit position in each sample (gvar)
+               g_hash_table_insert(channels, ch->pdch_->id, gvar);
        }
 
-       srd_inst_channel_set_all(decoder_inst, channels, unit_size);
+       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);
 
-       return decoder_inst;
+       return decoder_inst_;
+}
+
+void Decoder::invalidate_decoder_inst()
+{
+       decoder_inst_ = nullptr;
 }
 
-} // decode
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv