X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a557e1c16ebd601f8d2c65bd189ab544e0250faa;hp=253e3a987c6dbeb59e1f6344deff7d76c5aa4692;hb=946b52e1f0e0520415c3653cc6ea9d083718f76d;hpb=ecd07c20d34ce940163ac2e7fb26cb7ceac565bb

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 253e3a98..a557e1c1 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -36,12 +36,17 @@ using pv::data::decode::Row;
 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()));
 }
@@ -70,12 +75,18 @@ void DecodeSignal::stack_decoder(srd_decoder *decoder)
 	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();
 }
 
 void DecodeSignal::remove_decoder(int index)
 {
 	decoder_stack_->remove(index);
+	update_channel_list();
 	decoder_stack_->begin_decode();
 }
 
@@ -99,11 +110,94 @@ 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<data::DecodeChannel> 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<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_)
+		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<Logic> data;
+	shared_ptr<data::SignalBase> 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<Decoder> &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<LogicSegment> 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<Row> DecodeSignal::visible_rows() const
 {
 	return decoder_stack_->get_visible_rows();
@@ -118,6 +212,68 @@ void DecodeSignal::get_annotation_subset(
 		start_sample, end_sample);
 }
 
+void DecodeSignal::update_channel_list()
+{
+	list<data::DecodeChannel> prev_channels = channels_;
+	channels_.clear();
+
+	uint16_t id = 0;
+
+	// Copy existing entries, create new as needed
+	for (shared_ptr<Decoder> 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