Rework all subthread-based workers to make notifications more robust

[pulseview.git] / pv / data / logic.cpp

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index e78c28468d71ef42da07e7e0eb102076889cfd38..038da649896a0f915883403fb420a37d9d36db0d 100644 (file)
--- 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);
@@ -52,6 +53,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());
@@ -69,17 +75,27 @@ void Logic::clear()
        samples_cleared();
 }
 
+void Logic::set_samplerate(double value)
+{
+       samplerate_ = value;
+}
+
+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);