X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Flogic.cpp;h=ac47c29d6ac12d004f44c23ccc80b6678e44e78b;hb=HEAD;hp=084e8efd7f231fd920a0da8dfad18cfd9e4ac66e;hpb=7f9654641c096b303fc30b710335e235b9738ce9;p=pulseview.git

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 084e8efd..4a13e568 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);
@@ -44,7 +45,12 @@ unsigned int Logic::num_channels() const
 
 void Logic::push_segment(shared_ptr<LogicSegment> &segment)
 {
-	segments_.push_front(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
@@ -52,38 +58,60 @@ 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());
 }
 
-int Logic::get_segment_count() const
+uint32_t Logic::get_segment_count() const
 {
-	return segments_.size();
+	return (uint32_t)segments_.size();
 }
 
 void Logic::clear()
 {
-	segments_.clear();
+	if (!segments_.empty()) {
+		segments_.clear();
+
+		samples_cleared();
+	}
+}
+
+void Logic::set_samplerate(double value)
+{
+	samplerate_ = value;
+}
 
-	samples_cleared();
+double Logic::get_samplerate() const
+{
+	return samplerate_;
 }
 
 uint64_t Logic::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (shared_ptr<LogicSegment> s : segments_) {
+	for (const shared_ptr<LogicSegment>& s : segments_) {
 		assert(s);
 		l = max(l, s->get_sample_count());
 	}
 	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);
 }
 
+void Logic::on_segment_completed()
+{
+	segment_completed();
+}
+
 } // namespace data
 } // namespace pv