Session: Fix issue #67 by improving error handling

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

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 516060a0aec9013c139f8597dc0bf9bfd70de6aa..4a13e568bc80ff38770a245b1e9b38b1861d15a9 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);
@@ -45,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
@@ -52,6 +58,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 +75,21 @@ 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)
+{
+       samplerate_ = value;
 }
 
 double Logic::get_samplerate() const
 {
-       if (segments_.empty())
-               return 1.0;
-
-       return segments_.front()->samplerate();
+       return samplerate_;
 }
 
 uint64_t Logic::max_sample_count() const
@@ -87,11 +102,16 @@ 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);
 }
 
+void Logic::on_segment_completed()
+{
+       segment_completed();
+}
+
 } // namespace data
 } // namespace pv