X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fmathsignal.hpp;h=b554a07eeb84ffdf9cd3bda57ef972c88bc0013c;hb=79c0e0452fb025da84af9cc0953b85631af343f9;hp=6127b177e025175f1a7cf5621bb48a0ed089a2c1;hpb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;p=pulseview.git diff --git a/pv/data/mathsignal.hpp b/pv/data/mathsignal.hpp index 6127b177..b554a07e 100644 --- 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, @@ -92,7 +89,7 @@ private: 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 input_signals_; - QString expression_, error_message_; + QString expression_; mutable mutex input_mutex_; mutable condition_variable gen_input_cond_;