X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=f70c934fb0eacdc8374b1d341ac50c17a96bef87;hp=b29c6b56558d3dffb74cd22429d20a6b80efb7a9;hb=477472187338948c83bea5d790ead66034008296;hpb=12ea3616767553ee0a615f14bbcb8ec614589e34

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index b29c6b5..f70c934 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -149,19 +149,16 @@ 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:
 	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 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);
@@ -175,6 +172,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();
 
@@ -183,17 +185,13 @@ 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_;
 
 	QString internal_name_, name_;