X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=4a13e568bc80ff38770a245b1e9b38b1861d15a9;hb=30cdef99af65a04ee8c55ab816044c32f7e955ad;hp=038da649896a0f915883403fb420a37d9d36db0d;hpb=1f3033cb3e63de7cfe98dab537460443917fece3;p=pulseview.git

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 038da649..4a13e568 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -46,6 +46,11 @@ unsigned int Logic::num_channels() const
 void Logic::push_segment(shared_ptr<LogicSegment> &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<LogicSegment> >& Logic::logic_segments() const
@@ -70,9 +75,11 @@ uint32_t Logic::get_segment_count() const
 
 void Logic::clear()
 {
-	segments_.clear();
+	if (!segments_.empty()) {
+		segments_.clear();
 
-	samples_cleared();
+		samples_cleared();
+	}
 }
 
 void Logic::set_samplerate(double value)
@@ -101,5 +108,10 @@ void Logic::notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sam
 	samples_added(segment, start_sample, end_sample);
 }
 
+void Logic::on_segment_completed()
+{
+	segment_completed();
+}
+
 } // namespace data
 } // namespace pv