X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=5f95ec337b16d5504000ce02736d29d31f4c924c;hb=30cdef99af65a04ee8c55ab816044c32f7e955ad;hp=94e1f6a6c03a8f86318bfaf35d9c14fb572bb290;hpb=f6a93932056dab5e2f75207b65197b436d4141a5;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 94e1f6a6..5f95ec33 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -124,11 +124,12 @@ SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_
 	conversion_type_(NoConversion),
 	min_value_(0),
 	max_value_(0),
+	index_(0),
 	error_message_("")
 {
 	if (channel_) {
-		internal_name_ = QString::fromStdString(channel_->name());
-		index_ = channel_->index();
+		set_internal_name(QString::fromStdString(channel_->name()));
+		set_index(channel_->index());
 	}
 
 	connect(&delayed_conversion_starter_, SIGNAL(timeout()),
@@ -219,6 +220,9 @@ QString SignalBase::internal_name() const
 void SignalBase::set_internal_name(QString internal_name)
 {
 	internal_name_ = internal_name;
+
+	// Use this name also for the QObject instance
+	setObjectName(internal_name);
 }
 
 QString SignalBase::display_name() const
@@ -304,20 +308,33 @@ 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
 {
-	shared_ptr<Logic> result = dynamic_pointer_cast<Logic>(data_);
+	if (!data_)
+		return nullptr;
+
+	shared_ptr<Logic> result;
 
 	if (((conversion_type_ == A2LConversionByThreshold) ||
 		(conversion_type_ == A2LConversionBySchmittTrigger)))
 		result = dynamic_pointer_cast<Logic>(converted_data_);
+	else
+		result = dynamic_pointer_cast<Logic>(data_);
 
 	return result;
 }
 
+shared_ptr<pv::data::SignalData> SignalBase::data() const
+{
+	return data_;
+}
+
 bool SignalBase::segment_is_complete(uint32_t segment_id) const
 {
 	bool result = true;
@@ -706,6 +723,8 @@ void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment
 		delete[] lsamples;
 		delete[] asamples;
 	}
+
+	samples_added(lsegment->segment_id(), start_sample, end_sample);
 }
 
 void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
@@ -739,6 +758,9 @@ void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
 		// we do another round of sample conversion.
 	} while ((complete_state != old_complete_state) ||
 		(end_sample - old_end_sample >= ConversionBlockSize));
+
+	if (complete_state)
+		lsegment->set_complete();
 }
 
 void SignalBase::conversion_thread_proc()
@@ -765,6 +787,7 @@ void SignalBase::conversion_thread_proc()
 
 	shared_ptr<AnalogSegment> asegment = analog_data->analog_segments().front();
 	assert(asegment);
+	connect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
 
 	const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
 	assert(logic_data);
@@ -786,11 +809,15 @@ void SignalBase::conversion_thread_proc()
 		if (asegment->is_complete() &&
 			analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
 
+			disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
+
 			// There are more segments to process
 			segment_id++;
 
 			try {
 				asegment = analog_data->analog_segments().at(segment_id);
+				disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
+				connect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
 			} catch (out_of_range&) {
 				qDebug() << "Conversion error for" << name() << ": no analog segment" \
 					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
@@ -802,14 +829,16 @@ void SignalBase::conversion_thread_proc()
 			logic_data->push_segment(new_segment);
 
 			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);
+		} 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);
+			}
 		}
 	} while (!conversion_interrupt_);
+
+	disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
 }
 
 void SignalBase::start_conversion(bool delayed_start)
@@ -821,10 +850,10 @@ void SignalBase::start_conversion(bool delayed_start)
 
 	stop_conversion();
 
-	if (converted_data_)
+	if (converted_data_ && (converted_data_->get_segment_count() > 0)) {
 		converted_data_->clear();
-
-	samples_cleared();
+		samples_cleared();
+	}
 
 	conversion_interrupt_ = false;
 	conversion_thread_ = std::thread(&SignalBase::conversion_thread_proc, this);
@@ -850,10 +879,10 @@ void SignalBase::stop_conversion()
 
 void SignalBase::on_samples_cleared()
 {
-	if (converted_data_)
+	if (converted_data_ && (converted_data_->get_segment_count() > 0)) {
 		converted_data_->clear();
-
-	samples_cleared();
+		samples_cleared();
+	}
 }
 
 void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
@@ -873,6 +902,15 @@ void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sam
 	samples_added(segment->segment_id(), start_sample, end_sample);
 }
 
+void SignalBase::on_input_segment_completed()
+{
+	if (conversion_type_ != NoConversion)
+		if (conversion_thread_.joinable()) {
+			// Notify the conversion thread since it's running
+			conversion_input_cond_.notify_one();
+		}
+}
+
 void SignalBase::on_min_max_changed(float min, float max)
 {
 	// Restart conversion if one is enabled and uses a calculated threshold