X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a557e1c16ebd601f8d2c65bd189ab544e0250faa;hp=bc453d21b0fcc55608c81e0acf70970278d179cd;hb=946b52e1f0e0520415c3653cc6ea9d083718f76d;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index bc453d21..a557e1c1 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -24,22 +24,29 @@ #include #include +#include #include #include using std::make_shared; using std::shared_ptr; using pv::data::decode::Decoder; +using pv::data::decode::Row; namespace pv { namespace data { -DecodeSignal::DecodeSignal(shared_ptr decoder_stack) : +DecodeSignal::DecodeSignal(shared_ptr decoder_stack, + const unordered_set< shared_ptr > &all_signals) : SignalBase(nullptr, SignalBase::DecodeChannel), - decoder_stack_(decoder_stack) + decoder_stack_(decoder_stack), + all_signals_(all_signals) { set_name(QString::fromUtf8(decoder_stack_->stack().front()->decoder()->name)); + update_channel_list(); + auto_assign_signals(); + connect(decoder_stack_.get(), SIGNAL(new_annotations()), this, SLOT(on_new_annotations())); } @@ -58,17 +65,28 @@ shared_ptr DecodeSignal::decoder_stack() const return decoder_stack_; } +const list< shared_ptr >& DecodeSignal::decoder_stack_list() const +{ + return decoder_stack_->stack(); +} + void DecodeSignal::stack_decoder(srd_decoder *decoder) { assert(decoder); assert(decoder_stack); decoder_stack_->push(make_shared(decoder)); + + // Include the newly created decode channels in the channel list + update_channel_list(); + + auto_assign_signals(); decoder_stack_->begin_decode(); } void DecodeSignal::remove_decoder(int index) { decoder_stack_->remove(index); + update_channel_list(); decoder_stack_->begin_decode(); } @@ -92,6 +110,170 @@ bool DecodeSignal::toggle_decoder_visibility(int index) return state; } +void DecodeSignal::begin_decode() +{ + decoder_stack_->begin_decode(); +} + +QString DecodeSignal::error_message() const +{ + return decoder_stack_->error_message(); +} + +const list DecodeSignal::get_channels() const +{ + return channels_; +} + +void DecodeSignal::auto_assign_signals() +{ + // Try to auto-select channels that don't have signals assigned yet + for (data::DecodeChannel &ch : channels_) { + if (ch.assigned_signal) + continue; + + for (shared_ptr s : all_signals_) + if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower()))) + ch.assigned_signal = s.get(); + } +} + +void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal) +{ + for (data::DecodeChannel &ch : channels_) + if (ch.id == channel_id) + ch.assigned_signal = signal; + + channels_updated(); + + decoder_stack_->begin_decode(); +} + +void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state) +{ + for (data::DecodeChannel &ch : channels_) + if (ch.id == channel_id) + ch.initial_pin_state = init_state; + + channels_updated(); + + decoder_stack_->begin_decode(); +} + +int64_t DecodeSignal::sample_count() const +{ + shared_ptr data; + shared_ptr signalbase; + + // We get the logic data of the first channel in the list. + // This works because we are currently assuming all + // LogicSignals have the same data/segment + for (const shared_ptr &dec : decoder_stack_->stack()) + if (dec && !dec->channels().empty() && + ((signalbase = (*dec->channels().begin()).second)) && + ((data = signalbase->logic_data()))) + break; + + if (!data || data->logic_segments().empty()) + return 0; + + const shared_ptr segment = data->logic_segments().front(); + assert(segment); + + return (int64_t)segment->get_sample_count(); +} + +double DecodeSignal::samplerate() const +{ + return decoder_stack_->samplerate(); +} + +const pv::util::Timestamp& DecodeSignal::start_time() const +{ + return decoder_stack_->start_time(); +} + +int64_t DecodeSignal::samples_decoded() const +{ + return decoder_stack_->samples_decoded(); +} + +vector DecodeSignal::visible_rows() const +{ + return decoder_stack_->get_visible_rows(); +} + +void DecodeSignal::get_annotation_subset( + vector &dest, + const decode::Row &row, uint64_t start_sample, + uint64_t end_sample) const +{ + return decoder_stack_->get_annotation_subset(dest, row, + start_sample, end_sample); +} + +void DecodeSignal::update_channel_list() +{ + list prev_channels = channels_; + channels_.clear(); + + uint16_t id = 0; + + // Copy existing entries, create new as needed + for (shared_ptr decoder : decoder_stack_->stack()) { + const srd_decoder* srd_d = decoder->decoder(); + const GSList *l; + + // Mandatory channels + for (l = srd_d->channels; l; l = l->next) { + const struct srd_channel *const pdch = (struct srd_channel *)l->data; + bool ch_added = false; + + // Copy but update ID if this channel was in the list before + for (data::DecodeChannel ch : prev_channels) + if (ch.pdch_ == pdch) { + ch.id = id++; + channels_.push_back(ch); + ch_added = true; + break; + } + + if (!ch_added) { + // Create new entry without a mapped signal + data::DecodeChannel ch = {id++, false, nullptr, + QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc), + SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch}; + channels_.push_back(ch); + } + } + + // Optional channels + for (l = srd_d->opt_channels; l; l = l->next) { + const struct srd_channel *const pdch = (struct srd_channel *)l->data; + bool ch_added = false; + + // Copy but update ID if this channel was in the list before + for (data::DecodeChannel ch : prev_channels) + if (ch.pdch_ == pdch) { + ch.id = id++; + channels_.push_back(ch); + ch_added = true; + break; + } + + if (!ch_added) { + // Create new entry without a mapped signal + data::DecodeChannel ch = {id++, true, nullptr, + QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc), + SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch}; + channels_.push_back(ch); + } + } + } + + channels_updated(); +} + void DecodeSignal::on_new_annotations() { // Forward the signal to the frontend