X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=977a9cd68121f743e7e7070d67957e9d7e07081e;hb=63253d727162257aa0a3765bfb897c6826ebf611;hp=1675ed0abefea1c9c94ec151e4f3705d339646e4;hpb=f0f9c8566ba4992e3a3b71afd521da3278f37b7b;p=pulseview.git

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 1675ed0..977a9cd 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -30,6 +30,7 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QTimer>
 #include <QVariant>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -50,8 +51,10 @@ namespace pv {
 namespace data {
 
 class Analog;
+class AnalogSegment;
 class DecoderStack;
 class Logic;
+class LogicSegment;
 class SignalData;
 
 class SignalBase : public QObject
@@ -63,7 +66,6 @@ public:
 		AnalogChannel = 1, ///< Analog data
 		LogicChannel,  ///< Logic data
 		DecodeChannel, ///< Protocol Decoder channel using libsigrokdecode
-		A2LChannel,    ///< Analog converted to logic, joint representation
 		MathChannel    ///< Virtual channel generated by math operations
 	};
 
@@ -86,6 +88,7 @@ public:
 private:
 	static const int ColourBGAlpha;
 	static const uint64_t ConversionBlockSize;
+	static const uint32_t ConversionDelay;
 
 public:
 	SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type);
@@ -256,7 +259,7 @@ public:
 
 	virtual void restore_settings(QSettings &settings);
 
-	void start_conversion();
+	void start_conversion(bool delayed_start=false);
 
 private:
 	bool conversion_is_a2l() const;
@@ -265,7 +268,9 @@ private:
 	uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
 		float value, uint8_t &state);
 
-	void conversion_thread_proc(QObject* segment);
+	void convert_single_segment(pv::data::AnalogSegment *asegment,
+		pv::data::LogicSegment *lsegment);
+	void conversion_thread_proc();
 
 	void stop_conversion();
 
@@ -283,6 +288,8 @@ Q_SIGNALS:
 	void samples_added(QObject* segment, uint64_t start_sample,
 		uint64_t end_sample);
 
+	void min_max_changed(float min, float max);
+
 private Q_SLOTS:
 	void on_samples_cleared();
 
@@ -293,6 +300,8 @@ private Q_SLOTS:
 
 	void on_capture_state_changed(int state);
 
+	void on_delayed_conversion_start();
+
 protected:
 	shared_ptr<sigrok::Channel> channel_;
 	ChannelType channel_type_;
@@ -307,6 +316,7 @@ protected:
 	atomic<bool> conversion_interrupt_;
 	mutex conversion_input_mutex_;
 	condition_variable conversion_input_cond_;
+	QTimer delayed_conversion_starter_;
 
 	QString internal_name_, name_;
 	QColor colour_, bgcolour_;