X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fmathsignal.hpp;h=98adbe8099b57058ba1c1a3e4fa243e49b8b7439;hb=6daf265cd0e2a699a50ce434466881bd3b7f1d12;hp=f8e15d16261ba9ecbe74efe4015ba170241d00f4;hpb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;p=pulseview.git

diff --git a/pv/data/mathsignal.hpp b/pv/data/mathsignal.hpp
index f8e15d16..98adbe80 100644
--- a/pv/data/mathsignal.hpp
+++ b/pv/data/mathsignal.hpp
@@ -20,6 +20,12 @@
 #ifndef PULSEVIEW_PV_DATA_MATHSIGNAL_HPP
 #define PULSEVIEW_PV_DATA_MATHSIGNAL_HPP
 
+#define exprtk_disable_rtl_io_file /* Potential security issue, doubt anyone would use those anyway */
+#define exprtk_disable_rtl_vecops  /* Vector ops are rather useless for math channels */
+#define exprtk_disable_caseinsensitivity /* So that we can have both 't' and 'T' */
+
+#include <limits>
+
 #include <QString>
 
 #include <pv/exprtk.hpp>
@@ -30,6 +36,7 @@
 using std::atomic;
 using std::condition_variable;
 using std::mutex;
+using std::numeric_limits;
 using std::shared_ptr;
 
 namespace pv {
@@ -39,11 +46,24 @@ namespace data {
 
 class SignalBase;
 
+template<typename T>
+struct fnc_sample;
+
+struct signal_data {
+	signal_data(const shared_ptr<SignalBase> _sb) :
+		sb(_sb), sample_num(numeric_limits<uint64_t>::max()), sample_value(0), ref(nullptr)
+	{}
+
+	const shared_ptr<SignalBase> sb;
+	uint64_t sample_num;
+	double sample_value;
+	double* ref;
+};
+
 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;
@@ -55,13 +75,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);
+	void set_error(uint8_t type, QString msg);
 
 	/**
 	 * Returns the number of samples that can be worked on,
@@ -72,38 +90,41 @@ private:
 	 */
 	uint64_t get_working_sample_count(uint32_t segment_id) const;
 
+	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,
+	uint64_t generate_samples(uint32_t segment_id, const uint64_t start_sample,
 		const int64_t sample_count);
 	void generation_proc();
 
-Q_SIGNALS:
-	void samples_cleared();
-
-	void samples_added(uint64_t segment_id, uint64_t start_sample,
-		uint64_t end_sample);
+	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);
 
-	void min_max_changed(float min, float max);
+	bool all_input_signals_enabled(QString &disabled_signals) const;
 
+Q_SIGNALS:
 	void expression_changed(QString expression);
 
 private Q_SLOTS:
 	void on_capture_state_changed(int state);
 	void on_data_received();
 
+	void on_enabled_changed();
+
 private:
 	pv::Session &session_;
 
 	uint64_t custom_sample_rate_;
 	uint64_t custom_sample_count_;
 	bool use_custom_sample_rate_, use_custom_sample_count_;
-	vector< shared_ptr<SignalBase>> input_signals_;
+	uint64_t generation_chunk_size_;
+	map<std::string, signal_data> input_signals_;
 
 	QString expression_;
 
-	QString error_message_;
+	uint8_t error_type_;
 
 	mutable mutex input_mutex_;
 	mutable condition_variable gen_input_cond_;
@@ -111,10 +132,15 @@ private:
 	std::thread gen_thread_;
 	atomic<bool> gen_interrupt_;
 
-	exprtk::symbol_table<double> *exprtk_symbol_table_;
+	exprtk::symbol_table<double> *exprtk_unknown_symbol_table_, *exprtk_symbol_table_;
 	exprtk::expression<double> *exprtk_expression_;
 	exprtk::parser<double> *exprtk_parser_;
 	double exprtk_current_time_, exprtk_current_sample_;
+
+	fnc_sample<double>* fnc_sample_;
+
+	// Give sig_sample access to the private helper functions
+	friend struct fnc_sample<double>;
 };
 
 } // namespace data