Merge DecoderStack into DecodeSignal

[pulseview.git] / pv / data / signalbase.cpp

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 6bcacd734a94f7e15e91d46fc285c6a2424f68d3..bbb7fdc36382c82c76b8305c866a5c221454aeef 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -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)));
        }
 }
@@ -204,18 +200,7 @@ void SignalBase::set_conversion_type(ConversionType t)
 #ifdef ENABLE_DECODE
 bool SignalBase::is_decode_signal() const
 {
-       return (decoder_stack_ != nullptr);
-}
-
-shared_ptr<pv::data::DecoderStack> SignalBase::decoder_stack() const
-{
-       return decoder_stack_;
-}
-
-void SignalBase::set_decoder_stack(shared_ptr<pv::data::DecoderStack>
-       decoder_stack)
-{
-       decoder_stack_ = decoder_stack;
+       return (channel_type_ == DecodeChannel);
 }
 #endif
 
@@ -318,6 +303,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 +330,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 +340,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 +357,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)