X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=ab779228817bcb798edf4daaed9e13ab32e8288d;hb=1c552f400ee967f7a489853578c4d8d4bd2edfbf;hp=516060a0aec9013c139f8597dc0bf9bfd70de6aa;hpb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;p=pulseview.git

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 516060a0..ab779228 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -32,6 +32,7 @@ namespace data {
 
 Logic::Logic(unsigned int num_channels) :
 	SignalData(),
+	samplerate_(1),  // Default is 1 Hz to prevent division-by-zero errors
 	num_channels_(num_channels)
 {
 	assert(num_channels_ > 0);
@@ -45,6 +46,9 @@ 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();
 }
 
 const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
@@ -52,6 +56,11 @@ const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 	return segments_;
 }
 
+deque< shared_ptr<LogicSegment> >& Logic::logic_segments()
+{
+	return segments_;
+}
+
 vector< shared_ptr<Segment> > Logic::segments() const
 {
 	return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
@@ -64,17 +73,21 @@ uint32_t Logic::get_segment_count() const
 
 void Logic::clear()
 {
-	segments_.clear();
+	if (!segments_.empty()) {
+		segments_.clear();
 
-	samples_cleared();
+		samples_cleared();
+	}
 }
 
-double Logic::get_samplerate() const
+void Logic::set_samplerate(double value)
 {
-	if (segments_.empty())
-		return 1.0;
+	samplerate_ = value;
+}
 
-	return segments_.front()->samplerate();
+double Logic::get_samplerate() const
+{
+	return samplerate_;
 }
 
 uint64_t Logic::max_sample_count() const
@@ -87,7 +100,7 @@ uint64_t Logic::max_sample_count() const
 	return l;
 }
 
-void Logic::notify_samples_added(QObject* segment, uint64_t start_sample,
+void Logic::notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
 	samples_added(segment, start_sample, end_sample);