X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=c8a6d556648f1112c524be5ab7db4803cf20dcf0;hp=9894fdb4b1473eea638ef29da7e4c47145f45ebb;hb=8ce8ebb9796488bd2211591806ed00854ad64bb3;hpb=5d9fe823db16bc4a537e600451876a735d20a98d

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 9894fdb4..c8a6d556 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -20,14 +20,14 @@
 
 #include "analog.hpp"
 #include "analogsegment.hpp"
+#include "decode/row.hpp"
 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "signalbase.hpp"
 #include "signaldata.hpp"
-#include "decode/row.hpp"
 
-#include <pv/session.hpp>
 #include <pv/binding/decoder.hpp>
+#include <pv/session.hpp>
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
@@ -125,23 +125,19 @@ QColor SignalBase::bgcolour() const
 
 void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 {
-	if (data_ && channel_type_ == AnalogChannel) {
-		shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-		disconnect(analog_data.get(), SIGNAL(samples_cleared()),
+	if (data_) {
+		disconnect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		disconnect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
 			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
 	}
 
 	data_ = data;
 
-	if (data_ && channel_type_ == AnalogChannel) {
-		shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-		connect(analog_data.get(), SIGNAL(samples_cleared()),
+	if (data_) {
+		connect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		connect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
 			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
 	}
 }
@@ -318,6 +314,8 @@ void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample,
 				lsamples.push_back(convert_a2l_threshold(threshold, asamples[j]));
 			lsegment->append_payload(lsamples.data(), lsamples.size());
 			delete[] asamples;
+
+			samples_added(lsegment, start_sample, end_sample);
 		}
 
 		if (conversion_type_ == A2LConversionBySchmittTrigger) {
@@ -343,6 +341,8 @@ void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample,
 				lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j], state));
 			lsegment->append_payload(lsamples.data(), lsamples.size());
 			delete[] asamples;
+
+			samples_added(lsegment, start_sample, end_sample);
 		}
 	}
 }
@@ -351,15 +351,13 @@ void SignalBase::on_samples_cleared()
 {
 	if (converted_data_)
 		converted_data_->clear();
+
+	samples_cleared();
 }
 
 void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
-	(void)segment;
-	(void)start_sample;
-	(void)end_sample;
-
 	if (conversion_type_ != NoConversion) {
 
 		// Wait for the currently ongoing conversion to finish
@@ -370,6 +368,8 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 			&SignalBase::conversion_thread_proc, this,
 			segment, start_sample, end_sample);
 	}
+
+	samples_added(segment, start_sample, end_sample);
 }
 
 void SignalBase::on_capture_state_changed(int state)