namespace pv {
namespace data {
-DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack) :
+DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack,
+ const unordered_set< shared_ptr<data::SignalBase> > &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()));
assert(decoder);
assert(decoder_stack);
decoder_stack_->push(make_shared<data::decode::Decoder>(decoder));
+
+ // Include the newly created decode channels in the channel list
update_channel_list();
+
+ auto_assign_signals();
decoder_stack_->begin_decode();
}
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<data::SignalBase> 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_)