X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fmathsignal.hpp;fp=pv%2Fdata%2Fmathsignal.hpp;h=e452215bd7e9240faec0d61a8e763a276e211c36;hp=b554a07eeb84ffdf9cd3bda57ef972c88bc0013c;hb=66b6f41becf52ed12e50d1fa7f56cf0c76379d61;hpb=79c0e0452fb025da84af9cc0953b85631af343f9 diff --git a/pv/data/mathsignal.hpp b/pv/data/mathsignal.hpp index b554a07e..e452215b 100644 --- a/pv/data/mathsignal.hpp +++ b/pv/data/mathsignal.hpp @@ -75,7 +75,7 @@ public: void set_expression(QString expression); private: - virtual void set_error_message(QString msg); + void set_error(uint8_t type, QString msg); /** * Returns the number of samples that can be worked on, @@ -98,6 +98,8 @@ private: signal_data* signal_from_name(const std::string& name); void update_signal_sample(signal_data* sig_data, uint32_t segment_id, uint64_t sample_num); + bool all_input_signals_enabled(QString &disabled_signals) const; + Q_SIGNALS: void samples_cleared(); @@ -112,6 +114,8 @@ private Q_SLOTS: void on_capture_state_changed(int state); void on_data_received(); + void on_enabled_changed(); + private: pv::Session &session_; @@ -122,6 +126,8 @@ private: QString expression_; + uint8_t error_type_; + mutable mutex input_mutex_; mutable condition_variable gen_input_cond_;