Session: Fix issue #67 by improving error handling

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

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index da025882949ea8486638198fcb5fe124c22fa7ff..da9736b53fe29210d808fbb54a86c06c64889833 100644 (file)
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -31,13 +31,19 @@ namespace pv {
 namespace data {
 
 Analog::Analog() :
-       SignalData()
+       SignalData(),
+       samplerate_(1)  // Default is 1 Hz to prevent division-by-zero errors
 {
 }
 
 void Analog::push_segment(shared_ptr<AnalogSegment> &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<AnalogSegment> >& Analog::analog_segments() const
@@ -58,30 +64,34 @@ uint32_t Analog::get_segment_count() const
 
 void Analog::clear()
 {
-       segments_.clear();
+       if (!segments_.empty()) {
+               segments_.clear();
 
-       samples_cleared();
+               samples_cleared();
+       }
 }
 
-double Analog::get_samplerate() const
+void Analog::set_samplerate(double value)
 {
-       if (segments_.empty())
-               return 1.0;
+       samplerate_ = value;
+}
 
-       return segments_.front()->samplerate();
+double Analog::get_samplerate() const
+{
+       return samplerate_;
 }
 
 uint64_t Analog::max_sample_count() const
 {
        uint64_t l = 0;
-       for (const shared_ptr<AnalogSegment> s : segments_) {
+       for (const shared_ptr<AnalogSegment>& s : segments_) {
                assert(s);
                l = max(l, s->get_sample_count());
        }
        return l;
 }
 
-void Analog::notify_samples_added(QObject* segment, uint64_t start_sample,
+void Analog::notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
        uint64_t end_sample)
 {
        samples_added(segment, start_sample, end_sample);
@@ -92,5 +102,10 @@ void Analog::notify_min_max_changed(float min, float max)
        min_max_changed(min, max);
 }
 
+void Analog::on_segment_completed()
+{
+       segment_completed();
+}
+
 } // namespace data
 } // namespace pv