X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=5f6dc398f012d8507ca499f56b84887e04ec5a97;hb=d13d95b3eaee713cc4eabbc0682ca545b4c31800;hp=54063b1d236bc1eff9a8ca1e44ad76aa95409cae;hpb=784f6c75bf8d878b395b8eb7b5e92fa24d9b32ba;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 54063b1..5f6dc39 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -219,7 +219,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 		auto segments = data->analog_segments();
 		try {
 			result = segments.at(segment_id)->is_complete();
-		} catch (out_of_range) {
+		} catch (out_of_range&) {
 			// Do nothing
 		}
 	}
@@ -230,7 +230,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 		auto segments = data->logic_segments();
 		try {
 			result = segments.at(segment_id)->is_complete();
-		} catch (out_of_range) {
+		} catch (out_of_range&) {
 			// Do nothing
 		}
 	}
@@ -238,6 +238,33 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
 	return result;
 }
 
+bool SignalBase::has_samples() const
+{
+	bool result = false;
+
+	if (channel_type_ == AnalogChannel)
+	{
+		shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+		if (data) {
+			auto segments = data->analog_segments();
+			if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+				result = true;
+		}
+	}
+
+	if (channel_type_ == LogicChannel)
+	{
+		shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+		if (data) {
+			auto segments = data->logic_segments();
+			if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+				result = true;
+		}
+	}
+
+	return result;
+}
+
 SignalBase::ConversionType SignalBase::get_conversion_type() const
 {
 	return conversion_type_;
@@ -617,7 +644,7 @@ void SignalBase::conversion_thread_proc()
 
 			try {
 				asegment = analog_data->analog_segments().at(segment_id).get();
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				qDebug() << "Conversion error for" << name() << ": no analog segment" \
 					<< segment_id << ", segments size is" << analog_data->analog_segments().size();
 				return;