X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=621a3dda3560216fa3508594ccda5ff5e55deaae;hp=9894fdb4b1473eea638ef29da7e4c47145f45ebb;hb=bcaf033478ecf9a482f53b3dc973b7d2b9c4c52b;hpb=5d9fe823db16bc4a537e600451876a735d20a98d diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 9894fdb4..621a3dda 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 #include +#include using std::dynamic_pointer_cast; using std::make_shared; @@ -38,6 +38,7 @@ namespace pv { namespace data { const int SignalBase::ColourBGAlpha = 8 * 256 / 100; +const uint64_t SignalBase::ConversionBlockSize = 4096; SignalBase::SignalBase(shared_ptr channel, ChannelType channel_type) : channel_(channel), @@ -125,23 +126,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))); } } @@ -204,18 +201,7 @@ void SignalBase::set_conversion_type(ConversionType t) #ifdef ENABLE_DECODE bool SignalBase::is_decode_signal() const { - return (decoder_stack_ != nullptr); -} - -shared_ptr SignalBase::decoder_stack() const -{ - return decoder_stack_; -} - -void SignalBase::set_decoder_stack(shared_ptr - decoder_stack) -{ - decoder_stack_ = decoder_stack; + return (channel_type_ == DecodeChannel); } #endif @@ -254,8 +240,6 @@ uint8_t SignalBase::convert_a2l_schmitt_trigger(float lo_thr, float hi_thr, void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample, uint64_t end_sample) { - const uint64_t block_size = 4096; - // TODO Support for multiple segments is missing if ((channel_type_ == AnalogChannel) && @@ -294,7 +278,7 @@ void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample, tie(min_v, max_v) = asegment->get_min_max(); vector lsamples; - lsamples.reserve(block_size); + lsamples.reserve(ConversionBlockSize); uint64_t i = start_sample; @@ -302,12 +286,12 @@ void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample, const float threshold = (min_v + max_v) * 0.5; // middle between min and max // Convert as many sample blocks as we can - while ((end_sample - i) > block_size) { - const float* asamples = asegment->get_samples(i, i + block_size); - for (uint32_t j = 0; j < block_size; j++) + while ((end_sample - i) > ConversionBlockSize) { + const float* asamples = asegment->get_samples(i, i + ConversionBlockSize); + for (uint32_t j = 0; j < ConversionBlockSize; j++) lsamples.push_back(convert_a2l_threshold(threshold, asamples[j])); lsegment->append_payload(lsamples.data(), lsamples.size()); - i += block_size; + i += ConversionBlockSize; lsamples.clear(); delete[] asamples; } @@ -318,6 +302,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) { @@ -327,12 +313,12 @@ void SignalBase::conversion_thread_proc(QObject* segment, uint64_t start_sample, uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0 // Convert as many sample blocks as we can - while ((end_sample - i) > block_size) { - const float* asamples = asegment->get_samples(i, i + block_size); - for (uint32_t j = 0; j < block_size; j++) + while ((end_sample - i) > ConversionBlockSize) { + const float* asamples = asegment->get_samples(i, i + ConversionBlockSize); + for (uint32_t j = 0; j < ConversionBlockSize; j++) lsamples.push_back(convert_a2l_schmitt_trigger(lo_thr, hi_thr, asamples[j], state)); lsegment->append_payload(lsamples.data(), lsamples.size()); - i += block_size; + i += ConversionBlockSize; lsamples.clear(); delete[] asamples; } @@ -343,6 +329,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 +339,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 +356,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)