Add SignalBase::clear_sample_data() and local samplerate values

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index f8fe473d3681ebc31f0850d052af2d952d8fbae4..57d09502ae754503c507953e5e413e0102497e4d 100644 (file)
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -31,7 +31,8 @@ namespace pv {
 namespace data {
 
 Analog::Analog() :
 namespace data {
 
 Analog::Analog() :

-       SignalData()
+       SignalData(),
+       samplerate_(1)  // Default is 1 Hz to prevent division-by-zero errors

 {
 }
 
 {
 }
 


@@ -63,12 +64,14 @@ void Analog::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 Analog::max_sample_count() const

diff --git a/pv/data/analog.hpp b/pv/data/analog.hpp
index c0b9a0134d72d9b5028f75b5d19040a71d81c991..026d80463dcd24562507f8ebea6d4b96776cc774 100644 (file)
--- a/pv/data/analog.hpp
+++ b/pv/data/analog.hpp
@@ -53,6 +53,8 @@ public:
 
        void clear();
 
 
        void clear();
 

+       void set_samplerate(double value);
+

        double get_samplerate() const;
 
        uint64_t max_sample_count() const;
        double get_samplerate() const;
 
        uint64_t max_sample_count() const;


@@ -71,6 +73,7 @@ Q_SIGNALS:
        void min_max_changed(float min, float max);
 
 private:
        void min_max_changed(float min, float max);
 
 private:

+       double samplerate_;

        deque< shared_ptr<AnalogSegment> > segments_;
 };
 
        deque< shared_ptr<AnalogSegment> > segments_;
 };
 

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 516060a0aec9013c139f8597dc0bf9bfd70de6aa..7aefbf5f20f46af4c38736e2e4888f476396eaf1 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(),
 
 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);
        num_channels_(num_channels)
 {
        assert(num_channels_ > 0);


@@ -69,12 +70,14 @@ void Logic::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
 }
 
 uint64_t Logic::max_sample_count() const

diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp
index e0fb7dd14dd05dab2dc93451d999350f0d6dd60f..18622c1e6391f7a4fe39e38a79c4aca2afecddd1 100644 (file)
--- a/pv/data/logic.hpp
+++ b/pv/data/logic.hpp
@@ -54,6 +54,8 @@ public:
 
        void clear();
 
 
        void clear();
 

+       void set_samplerate(double value);
+

        double get_samplerate() const;
 
        uint64_t max_sample_count() const;
        double get_samplerate() const;
 
        uint64_t max_sample_count() const;


@@ -68,6 +70,7 @@ Q_SIGNALS:
                uint64_t end_sample);
 
 private:
                uint64_t end_sample);
 
 private:

+       double samplerate_;

        const unsigned int num_channels_;
        deque< shared_ptr<LogicSegment> > segments_;
 };
        const unsigned int num_channels_;
        deque< shared_ptr<LogicSegment> > segments_;
 };

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index fde99e2b4619a3cadf2b2acd01a862759c183d3f..d09615c8fc1130fb95fbf0f05629c50ec8c918a8 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -185,6 +185,15 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
        }
 }
 
        }
 }
 

+void SignalBase::clear_sample_data()
+{
+       if (analog_data())
+               analog_data()->clear();
+
+       if (logic_data())
+               logic_data()->clear();
+}
+

 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
        shared_ptr<Analog> result = nullptr;
 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
        shared_ptr<Analog> result = nullptr;

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 6decf26e6a96c3af654743f0724b0ec1c2ee7408..d6f11d82929ca40584cfbcaa78b5c154d3188bef 100644 (file)
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -171,6 +171,11 @@ public:
         */
        void set_data(shared_ptr<pv::data::SignalData> data);
 
         */
        void set_data(shared_ptr<pv::data::SignalData> data);
 

+       /**
+        * Clears all sample data and removes all associated segments.
+        */
+       void clear_sample_data();
+

        /**
         * Get the internal data as analog data object in case of analog type.
         */
        /**
         * Get the internal data as analog data object in case of analog type.
         */

diff --git a/pv/data/signaldata.hpp b/pv/data/signaldata.hpp
index 5168fee8e4b58fb6c75dec7afe26364a4709d47a..6d2283abeaddc962d6529dc1b9150df94a459428 100644 (file)
--- a/pv/data/signaldata.hpp
+++ b/pv/data/signaldata.hpp
@@ -51,6 +51,8 @@ public:
 
        virtual uint64_t max_sample_count() const = 0;
 
 
        virtual uint64_t max_sample_count() const = 0;
 

+       virtual void set_samplerate(double value) = 0;
+

        virtual double get_samplerate() const = 0;
 };
 
        virtual double get_samplerate() const = 0;
 };