X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=c8a6d556648f1112c524be5ab7db4803cf20dcf0;hp=45dc082cce7f65c5dbc55548b94692d43dfc0729;hb=8ce8ebb9796488bd2211591806ed00854ad64bb3;hpb=bc9177b394e33bfec1f3fc85fb09c2f74c1c7de3 diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 45dc082c..c8a6d556 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -125,23 +125,19 @@ QColor SignalBase::bgcolour() const void SignalBase::set_data(shared_ptr data) { - if (data_ && channel_type_ == AnalogChannel) { - shared_ptr analog_data = dynamic_pointer_cast(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_data = dynamic_pointer_cast(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))); } } @@ -362,10 +358,6 @@ void SignalBase::on_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