X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=468a2032812cba3b7611f1d6cf5dcfa718fe0bc5;hb=88870fffb650365d2ece97e41981ad78fec06600;hp=381716480371f6c5494a618e53aca196c7160787;hpb=5d9fe823db16bc4a537e600451876a735d20a98d;p=pulseview.git

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 38171648..468a2032 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_DATA_SIGNALBASE_HPP
 #define PULSEVIEW_PV_DATA_SIGNALBASE_HPP
 
+#include <atomic>
+#include <condition_variable>
 #include <thread>
 
 #include <QColor>
@@ -30,6 +32,9 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::atomic;
+using std::condition_variable;
+using std::mutex;
 using std::shared_ptr;
 
 namespace sigrok {
@@ -65,6 +70,7 @@ public:
 
 private:
 	static const int ColourBGAlpha;
+	static const uint64_t ConversionBlockSize;
 
 public:
 	SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type);
@@ -93,10 +99,19 @@ public:
 	ChannelType type() const;
 
 	/**
-	 * Gets the index number of this channel.
+	 * Gets the index number of this channel, i.e. a unique ID assigned by
+	 * the device driver.
 	 */
 	unsigned int index() const;
 
+	/**
+	 * Returns which bit of a given sample for this signal represents the
+	 * signal itself. This is relevant for compound signals like logic,
+	 * rather meaningless for everything else but provided in case there
+	 * is a conversion active that provides a digital signal using bit #0.
+	 */
+	unsigned int logic_bit_index() const;
+
 	/**
 	 * Gets the name of this signal.
 	 */
@@ -149,23 +164,23 @@ public:
 
 #ifdef ENABLE_DECODE
 	bool is_decode_signal() const;
-
-	shared_ptr<pv::data::DecoderStack> decoder_stack() const;
-
-	void set_decoder_stack(shared_ptr<pv::data::DecoderStack> decoder_stack);
 #endif
 
-	void save_settings(QSettings &settings) const;
+	virtual void save_settings(QSettings &settings) const;
 
-	void restore_settings(QSettings &settings);
+	virtual void restore_settings(QSettings &settings);
 
 private:
+	bool conversion_is_a2l() const;
+
 	uint8_t convert_a2l_threshold(float threshold, float value);
 	uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
 		float value, uint8_t &state);
 
-	void conversion_thread_proc(QObject* segment, uint64_t start_sample,
-		uint64_t end_sample);
+	void conversion_thread_proc(QObject* segment);
+
+	void start_conversion();
+	void stop_conversion();
 
 Q_SIGNALS:
 	void enabled_changed(const bool &value);
@@ -176,6 +191,11 @@ Q_SIGNALS:
 
 	void conversion_type_changed(const ConversionType t);
 
+	void samples_cleared();
+
+	void samples_added(QObject* segment, uint64_t start_sample,
+		uint64_t end_sample);
+
 private Q_SLOTS:
 	void on_samples_cleared();
 
@@ -184,18 +204,17 @@ private Q_SLOTS:
 
 	void on_capture_state_changed(int state);
 
-private:
+protected:
 	shared_ptr<sigrok::Channel> channel_;
 	ChannelType channel_type_;
 	shared_ptr<pv::data::SignalData> data_;
 	shared_ptr<pv::data::SignalData> converted_data_;
 	int conversion_type_;
 
-#ifdef ENABLE_DECODE
-	shared_ptr<pv::data::DecoderStack> decoder_stack_;
-#endif
-
 	std::thread conversion_thread_;
+	atomic<bool> conversion_interrupt_;
+	mutex conversion_input_mutex_;
+	condition_variable conversion_input_cond_;
 
 	QString internal_name_, name_;
 	QColor colour_, bgcolour_;