X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=ebcbc1c9bfa45a2c25e297becd0e243910f90596;hp=cd3e97d649ec52f0646fa269402b3f5e3d3668c5;hb=HEAD;hpb=20f59e957e70250cfb876ac7a1743134d6b83339 diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index cd3e97d6..ebcbc1c9 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -19,6 +19,8 @@ #include +#include + #include #include @@ -27,7 +29,6 @@ #include #include -using pv::data::DecodeChannel; using std::map; using std::string; @@ -35,10 +36,81 @@ namespace pv { namespace data { namespace decode { -Decoder::Decoder(const srd_decoder *const dec) : - decoder_(dec), - shown_(true) +AnnotationClass::AnnotationClass(size_t _id, char* _name, char* _description, Row* _row) : + id(_id), + name(_name), + description(_description), + row(_row), + visible_(true) +{ +} + +bool AnnotationClass::visible() const +{ + return visible_; +} + +void AnnotationClass::set_visible(bool visible) +{ + visible_ = visible; + + visibility_changed(); +} + + +Decoder::Decoder(const srd_decoder *const dec, uint8_t stack_level) : + srd_decoder_(dec), + stack_level_(stack_level), + visible_(true), + decoder_inst_(nullptr) { + // Query the annotation output classes + uint32_t i = 0; + for (GSList *l = dec->annotations; l; l = l->next) { + char **ann_class = (char**)l->data; + char *name = ann_class[0]; + char *desc = ann_class[1]; + ann_classes_.emplace_back(i++, name, desc, nullptr); + + connect(&(ann_classes_.back()), SIGNAL(visibility_changed()), + this, SLOT(on_class_visibility_changed())); + } + + // Query the binary output classes + i = 0; + for (GSList *l = dec->binary; l; l = l->next) { + char **bin_class = (char**)l->data; + char *name = bin_class[0]; + char *desc = bin_class[1]; + bin_classes_.push_back({i++, name, desc}); + } + + // Query the annotation rows and reference them by the classes that use them + uint32_t row_count = 0; + for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next) + row_count++; + + i = 0; + for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next) { + const srd_decoder_annotation_row *const srd_row = (srd_decoder_annotation_row *)rl->data; + assert(srd_row); + rows_.emplace_back(i++, this, srd_row); + + // FIXME PV can crash from .at() if a PD's ann classes are defined incorrectly + for (const GSList *cl = srd_row->ann_classes; cl; cl = cl->next) + ann_classes_.at((size_t)cl->data).row = &(rows_.back()); + + connect(&(rows_.back()), SIGNAL(visibility_changed()), + this, SLOT(on_row_visibility_changed())); + } + + if (rows_.empty()) { + // Make sure there is a row for PDs without row declarations + rows_.emplace_back(0, this); + + for (AnnotationClass& c : ann_classes_) + c.row = &(rows_.back()); + } } Decoder::~Decoder() @@ -47,19 +119,31 @@ Decoder::~Decoder() g_variant_unref(option.second); } -const srd_decoder* Decoder::decoder() const +const srd_decoder* Decoder::get_srd_decoder() const { - return decoder_; + return srd_decoder_; } -bool Decoder::shown() const +uint8_t Decoder::get_stack_level() const { - return shown_; + return stack_level_; } -void Decoder::show(bool show) +const char* Decoder::name() const { - shown_ = show; + return srd_decoder_->name; +} + +bool Decoder::visible() const +{ + return visible_; +} + +void Decoder::set_visible(bool visible) +{ + visible_ = visible; + + annotation_visibility_changed(); } const vector& Decoder::channels() const @@ -82,6 +166,27 @@ 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 + apply_all_options(); +} + +void Decoder::apply_all_options() +{ + if (decoder_inst_) { + GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash, + g_str_equal, g_free, (GDestroyNotify)g_variant_unref); + + for (const auto& option : options_) { + GVariant *const value = option.second; + g_variant_ref(value); + g_hash_table_replace(opt_hash, (void*)g_strdup( + option.first.c_str()), value); + } + + srd_inst_option_set(decoder_inst_, opt_hash); + g_hash_table_destroy(opt_hash); + } } bool Decoder::have_required_channels() const @@ -93,7 +198,7 @@ bool Decoder::have_required_channels() const 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); @@ -105,15 +210,17 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const 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, srd_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, + 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()); @@ -122,20 +229,122 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const 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; - 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); - // 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); } - 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); + + return decoder_inst_; +} + +void Decoder::invalidate_decoder_inst() +{ + decoder_inst_ = nullptr; +} + +vector Decoder::get_rows() +{ + vector result; - srd_inst_initial_pins_set_all(decoder_inst, init_pin_states); - g_array_free(init_pin_states, TRUE); + for (Row& row : rows_) + result.push_back(&row); + + return result; +} + +Row* Decoder::get_row_by_id(size_t id) +{ + if (id > rows_.size()) + return nullptr; + + return &(rows_[id]); +} + +vector Decoder::ann_classes() const +{ + vector result; + + for (const AnnotationClass& c : ann_classes_) + result.push_back(&c); + + return result; +} + +vector Decoder::ann_classes() +{ + vector result; + + for (AnnotationClass& c : ann_classes_) + result.push_back(&c); + + return result; +} + +AnnotationClass* Decoder::get_ann_class_by_id(size_t id) +{ + if (id >= ann_classes_.size()) + return nullptr; + + return &(ann_classes_[id]); +} + +const AnnotationClass* Decoder::get_ann_class_by_id(size_t id) const +{ + if (id >= ann_classes_.size()) + return nullptr; + + return &(ann_classes_[id]); +} + +uint32_t Decoder::get_binary_class_count() const +{ + return bin_classes_.size(); +} + +const DecodeBinaryClassInfo* Decoder::get_binary_class(uint32_t id) const +{ + return &(bin_classes_.at(id)); +} + +void Decoder::on_row_visibility_changed() +{ + annotation_visibility_changed(); +} + +void Decoder::on_class_visibility_changed() +{ + annotation_visibility_changed(); +} + +bool Decoder::has_logic_output() const +{ + return (srd_decoder_->logic_output_channels != nullptr); +} + +const vector Decoder::logic_output_channels() const +{ + vector result; + + for (GSList *l = srd_decoder_->logic_output_channels; l; l = l->next) { + const srd_decoder_logic_output_channel* ch_data = + (srd_decoder_logic_output_channel*)l->data; + + result.emplace_back(QString::fromUtf8(ch_data->id), + QString::fromUtf8(ch_data->desc)); + } - return decoder_inst; + return result; } } // namespace decode