Restore math signals as well

[pulseview.git] / pv / data / mathsignal.hpp

diff --git a/pv/data/mathsignal.hpp b/pv/data/mathsignal.hpp
index a1fb9ffb899db98732e994d725ef91ba343a1dcf..b554a07eeb84ffdf9cd3bda57ef972c88bc0013c 100644 (file)
--- a/pv/data/mathsignal.hpp
+++ b/pv/data/mathsignal.hpp
@@ -60,7 +60,6 @@ class MathSignal : public SignalBase
 {
        Q_OBJECT
        Q_PROPERTY(QString expression READ get_expression WRITE set_expression NOTIFY expression_changed)
-       Q_PROPERTY(QString error_message READ error_message)
 
 private:
        static const int64_t ChunkLength;
@@ -72,13 +71,11 @@ public:
        virtual void save_settings(QSettings &settings) const;
        virtual void restore_settings(QSettings &settings);
 
-       QString error_message() const;
-
        QString get_expression() const;
        void set_expression(QString expression);
 
 private:
-       void set_error_message(QString msg);
+       virtual void set_error_message(QString msg);
 
        /**
         * Returns the number of samples that can be worked on,
@@ -89,10 +86,10 @@ private:
         */
        uint64_t get_working_sample_count(uint32_t segment_id) const;
 
-       void update_completeness(uint32_t segment_id);
+       void update_completeness(uint32_t segment_id, uint64_t output_sample_count);
 
        void reset_generation();
-       void begin_generation();
+       virtual void begin_generation();
 
        void generate_samples(uint32_t segment_id, const uint64_t start_sample,
                const int64_t sample_count);
@@ -123,7 +120,7 @@ private:
        bool use_custom_sample_rate_, use_custom_sample_count_;
        map<std::string, signal_data> input_signals_;
 
-       QString expression_, error_message_;
+       QString expression_;
 
        mutable mutex input_mutex_;
        mutable condition_variable gen_input_cond_;