X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=da9736b53fe29210d808fbb54a86c06c64889833;hb=1c552f400ee967f7a489853578c4d8d4bd2edfbf;hp=02cb83e40c7e474729c7c6d82035f673138f6d36;hpb=1f3033cb3e63de7cfe98dab537460443917fece3;p=pulseview.git

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index 02cb83e4..da9736b5 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -39,6 +39,11 @@ Analog::Analog() :
 void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
 {
 	segments_.push_back(segment);
+
+	if ((samplerate_ == 1) && (segment->samplerate() > 1))
+		samplerate_ = segment->samplerate();
+
+	connect(segment.get(), SIGNAL(completed()), this, SLOT(on_segment_completed()));
 }
 
 const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
@@ -59,9 +64,11 @@ uint32_t Analog::get_segment_count() const
 
 void Analog::clear()
 {
-	segments_.clear();
+	if (!segments_.empty()) {
+		segments_.clear();
 
-	samples_cleared();
+		samples_cleared();
+	}
 }
 
 void Analog::set_samplerate(double value)
@@ -95,5 +102,10 @@ void Analog::notify_min_max_changed(float min, float max)
 	min_max_changed(min, max);
 }
 
+void Analog::on_segment_completed()
+{
+	segment_completed();
+}
+
 } // namespace data
 } // namespace pv