X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=09f0d20ceff816ec97d9d758f687a33a49592c0e;hb=4c4f604f982caab24714508586ab4cde0c8408e2;hp=2de6fbeedd8dff0f266d17caad65125fa0e78817;hpb=883041605ce8536ece950b1de191cfe71068dfba;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 2de6fbee..09f0d20c 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -68,6 +68,20 @@ DecodeSignal::~DecodeSignal()
 	reset_decode(true);
 }
 
+void DecodeSignal::set_name(QString name)
+{
+	SignalBase::set_name(name);
+
+	update_output_signals();
+}
+
+void DecodeSignal::set_color(QColor color)
+{
+	SignalBase::set_color(color);
+
+	update_output_signals();
+}
+
 const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 {
 	return stack_;
@@ -386,6 +400,7 @@ void DecodeSignal::update_output_signals()
 				shared_ptr<Logic> logic_data = make_shared<Logic>(logic_channels.size());
 				logic_data->set_samplerate(get_samplerate());
 				output_logic_[dec->get_srd_decoder()] = logic_data;
+				output_logic_muxed_data_[dec->get_srd_decoder()] = vector<uint8_t>();
 
 				shared_ptr<LogicSegment> logic_segment = make_shared<data::LogicSegment>(
 					*logic_data, 0, (logic_data->num_channels() + 7) / 8, get_samplerate());
@@ -396,7 +411,6 @@ void DecodeSignal::update_output_signals()
 					shared_ptr<data::SignalBase> signal =
 						make_shared<data::SignalBase>(nullptr, LogicChannel);
 					signal->set_internal_name(logic_ch.id);
-					signal->set_name(logic_ch.id);
 					signal->set_index(index);
 					signal->set_data(logic_data);
 					output_signals_.push_back(signal);
@@ -412,9 +426,12 @@ void DecodeSignal::update_output_signals()
 		}
 	}
 
-	// TODO Delete signals that no longer have a corresponding decoder (also from session)
+	for (shared_ptr<SignalBase> s : output_signals_) {
+		s->set_name(s->internal_name() + " (" + name() + ")");
+		s->set_color(color());
+	}
+
 	// TODO Assert that all sample rates are the same as the session's
-	// TODO Set colors to the same as the decoder's background color
 }
 
 void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state)
@@ -1751,14 +1768,24 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
 		output_logic->push_segment(last_segment);
 	}
 
-	vector<uint8_t> data;
-	for (unsigned int i = pdata->start_sample; i < pdata->end_sample; i++)
-		data.emplace_back(*((uint8_t*)pdl->data));
+	if (pdata->start_sample < pdata->end_sample) {
+		vector<uint8_t> data;
+		for (unsigned int i = pdata->start_sample; i < pdata->end_sample; i++)
+			data.emplace_back(*((uint8_t*)pdl->data));
+
+		if ((pdl->logic_class == 0) || ((pdl->logic_class > 0) && (data.size() <= ds->output_logic_muxed_data_.at(decc).size()))) {
+			last_segment->append_subsignal_payload(pdl->logic_class, data.data(),
+				data.size(), ds->output_logic_muxed_data_.at(decc));
 
-	last_segment->append_subsignal_payload(pdl->logic_class, data.data(), data.size());
+			qInfo() << "Received logic output state change for class" << pdl->logic_class << "from decoder" \
+				<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
+		} else
+			qWarning() << "Ignoring invalid logic output state change for class" << pdl->logic_class << "from decoder" \
+				<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
 
-	qInfo() << "Received logic output state change for class" << pdl->logic_class << "from decoder" \
-		<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
+	} else
+		qWarning() << "Ignoring malformed logic output state change for class" << pdl->logic_class << "from decoder" \
+			<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
 }
 
 void DecodeSignal::on_capture_state_changed(int state)