X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=578d908f8d52a036b4e5c9f4a553a34865264bb3;hb=cf1541a18fcd007c9965a3199b9c4f917856b292;hp=c15a44319d21030b3795fcdd3e25b8513869ce49;hpb=516b0c4163547a969da7686702c043e7e0335419;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index c15a4431..578d908f 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -123,7 +123,8 @@ SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_
 	group_(nullptr),
 	conversion_type_(NoConversion),
 	min_value_(0),
-	max_value_(0)
+	max_value_(0),
+	error_message_("")
 {
 	if (channel_) {
 		internal_name_ = QString::fromStdString(channel_->name());
@@ -258,6 +259,11 @@ QColor SignalBase::bgcolor() const
 	return bgcolor_;
 }
 
+QString SignalBase::get_error_message() const
+{
+	return error_message_;
+}
+
 void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 {
 	if (data_) {
@@ -298,11 +304,17 @@ void SignalBase::clear_sample_data()
 
 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
+	if (!data_)
+		return nullptr;
+
 	return dynamic_pointer_cast<Analog>(data_);
 }
 
 shared_ptr<data::Logic> SignalBase::logic_data() const
 {
+	if (!data_)
+		return nullptr;
+
 	shared_ptr<Logic> result = dynamic_pointer_cast<Logic>(data_);
 
 	if (((conversion_type_ == A2LConversionByThreshold) ||
@@ -601,8 +613,8 @@ bool SignalBase::conversion_is_a2l() const
 		(conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
-void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
-	LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
+void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+	shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample)
 {
 	if (end_sample > start_sample) {
 		tie(min_value_, max_value_) = asegment->get_min_max();
@@ -676,6 +688,7 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
 
 				lsegment->append_payload(logic->data_pointer(), logic->data_length());
 				samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+
 				i += ConversionBlockSize;
 			}
 
@@ -701,7 +714,8 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
 	}
 }
 
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
+	shared_ptr<LogicSegment> lsegment)
 {
 	uint64_t start_sample, end_sample, old_end_sample;
 	start_sample = end_sample = 0;
@@ -755,7 +769,7 @@ void SignalBase::conversion_thread_proc()
 
 	uint32_t segment_id = 0;
 
-	AnalogSegment *asegment = analog_data->analog_segments().front().get();
+	shared_ptr<AnalogSegment> asegment = analog_data->analog_segments().front();
 	assert(asegment);
 
 	const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
@@ -768,7 +782,7 @@ void SignalBase::conversion_thread_proc()
 		logic_data->push_segment(new_segment);
 	}
 
-	LogicSegment *lsegment = logic_data->logic_segments().front().get();
+	shared_ptr<LogicSegment> lsegment = logic_data->logic_segments().front();
 	assert(lsegment);
 
 	do {
@@ -777,11 +791,12 @@ void SignalBase::conversion_thread_proc()
 		// Only advance to next segment if the current input segment is complete
 		if (asegment->is_complete() &&
 			analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+
 			// There are more segments to process
 			segment_id++;
 
 			try {
-				asegment = analog_data->analog_segments().at(segment_id).get();
+				asegment = analog_data->analog_segments().at(segment_id);
 			} catch (out_of_range&) {
 				qDebug() << "Conversion error for" << name() << ": no analog segment" \
 					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
@@ -792,13 +807,13 @@ void SignalBase::conversion_thread_proc()
 				*logic_data.get(), segment_id, 1, asegment->samplerate());
 			logic_data->push_segment(new_segment);
 
-			lsegment = logic_data->logic_segments().back().get();
-		} else {
-			// No more samples/segments to process, wait for data or interrupt
-			if (!conversion_interrupt_) {
-				unique_lock<mutex> input_lock(conversion_input_mutex_);
-				conversion_input_cond_.wait(input_lock);
-			}
+			lsegment = logic_data->logic_segments().back();
+		}
+
+		// No more samples/segments to process, wait for data or interrupt
+		if (!conversion_interrupt_) {
+			unique_lock<mutex> input_lock(conversion_input_mutex_);
+			conversion_input_cond_.wait(input_lock);
 		}
 	} while (!conversion_interrupt_);
 }
@@ -814,11 +829,20 @@ void SignalBase::start_conversion(bool delayed_start)
 
 	if (converted_data_)
 		converted_data_->clear();
+
 	samples_cleared();
 
 	conversion_interrupt_ = false;
-	conversion_thread_ = std::thread(
-		&SignalBase::conversion_thread_proc, this);
+	conversion_thread_ = std::thread(&SignalBase::conversion_thread_proc, this);
+}
+
+void SignalBase::set_error_message(QString msg)
+{
+	error_message_ = msg;
+	// TODO Emulate noquote()
+	qDebug().nospace() << name() << ": " << msg;
+
+	error_message_changed(msg);
 }
 
 void SignalBase::stop_conversion()