X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=5f6dc398f012d8507ca499f56b84887e04ec5a97;hp=fe7c584b62b4eab7c58e2383b77989f0bd0194da;hb=d13d95b3eaee713cc4eabbc0682ca545b4c31800;hpb=f0f9c8566ba4992e3a3b71afd521da3278f37b7b diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index fe7c584b..5f6dc398 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -26,11 +26,14 @@ #include "signalbase.hpp" #include "signaldata.hpp" +#include + #include #include using std::dynamic_pointer_cast; using std::make_shared; +using std::out_of_range; using std::shared_ptr; using std::tie; using std::unique_lock; @@ -40,6 +43,7 @@ namespace data { const int SignalBase::ColourBGAlpha = 8 * 256 / 100; const uint64_t SignalBase::ConversionBlockSize = 4096; +const uint32_t SignalBase::ConversionDelay = 1000; // 1 second SignalBase::SignalBase(shared_ptr channel, ChannelType channel_type) : channel_(channel), @@ -50,6 +54,11 @@ SignalBase::SignalBase(shared_ptr channel, ChannelType channel_ { if (channel_) internal_name_ = QString::fromStdString(channel_->name()); + + connect(&delayed_conversion_starter_, SIGNAL(timeout()), + this, SLOT(on_delayed_conversion_start())); + delayed_conversion_starter_.setSingleShot(true); + delayed_conversion_starter_.setInterval(ConversionDelay); } SignalBase::~SignalBase() @@ -72,6 +81,14 @@ QString SignalBase::internal_name() const return internal_name_; } +QString SignalBase::display_name() const +{ + if (name() != internal_name_) + return name() + " (" + internal_name_ + ")"; + else + return name(); +} + void SignalBase::set_name(QString name) { if (channel_) @@ -192,6 +209,62 @@ shared_ptr SignalBase::logic_data() const return result; } +bool SignalBase::segment_is_complete(uint32_t segment_id) const +{ + bool result = true; + + if (channel_type_ == AnalogChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + auto segments = data->analog_segments(); + try { + result = segments.at(segment_id)->is_complete(); + } catch (out_of_range&) { + // Do nothing + } + } + + if (channel_type_ == LogicChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + auto segments = data->logic_segments(); + try { + result = segments.at(segment_id)->is_complete(); + } catch (out_of_range&) { + // Do nothing + } + } + + return result; +} + +bool SignalBase::has_samples() const +{ + bool result = false; + + if (channel_type_ == AnalogChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + if (data) { + auto segments = data->analog_segments(); + if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0)) + result = true; + } + } + + if (channel_type_ == LogicChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + if (data) { + auto segments = data->logic_segments(); + if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0)) + result = true; + } + } + + return result; +} + SignalBase::ConversionType SignalBase::get_conversion_type() const { return conversion_type_; @@ -338,7 +411,7 @@ SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const if (preset != conversion_options_.end()) return (ConversionPreset)((preset->second).toInt()); - return NoPreset; + return DynamicPreset; } void SignalBase::set_conversion_preset(ConversionPreset id) @@ -393,154 +466,221 @@ bool SignalBase::conversion_is_a2l() const (conversion_type_ == A2LConversionBySchmittTrigger))); } -void SignalBase::conversion_thread_proc(QObject* segment) +void SignalBase::convert_single_segment_range(AnalogSegment *asegment, + LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample) { - // TODO Support for multiple segments is missing + if (end_sample > start_sample) { + tie(min_value_, max_value_) = asegment->get_min_max(); - uint64_t start_sample, end_sample; - start_sample = end_sample = 0; + // Create sigrok::Analog instance + float *asamples = new float[ConversionBlockSize]; + uint8_t *lsamples = new uint8_t[ConversionBlockSize]; - do { - if (conversion_is_a2l()) { + vector > channels; + channels.push_back(channel_); + + vector mq_flags; + const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE; + const sigrok::Unit * const unit = sigrok::Unit::VOLT; - AnalogSegment *asegment = qobject_cast(segment); + shared_ptr packet = + Session::sr_context->create_analog_packet(channels, + asamples, ConversionBlockSize, mq, unit, mq_flags); - const shared_ptr logic_data = dynamic_pointer_cast(converted_data_); + shared_ptr analog = + dynamic_pointer_cast(packet->payload()); - // Create the initial logic data segment if needed - if (logic_data->segments().size() == 0) { - shared_ptr lsegment = - make_shared(*logic_data.get(), 1, asegment->samplerate()); - logic_data->push_segment(lsegment); + // Convert + uint64_t i = start_sample; + + if (conversion_type_ == A2LConversionByThreshold) { + const double threshold = get_conversion_thresholds()[0]; + + // Convert as many sample blocks as we can + while ((end_sample - i) > ConversionBlockSize) { + asegment->get_samples(i, i + ConversionBlockSize, asamples); + + shared_ptr logic = + analog->get_logic_via_threshold(threshold, lsamples); + + lsegment->append_payload(logic->data_pointer(), logic->data_length()); + samples_added(lsegment->segment_id(), i, i + ConversionBlockSize); + i += ConversionBlockSize; } - LogicSegment *lsegment = dynamic_cast(logic_data->segments().front().get()); + // Re-create sigrok::Analog and convert remaining samples + packet = Session::sr_context->create_analog_packet(channels, + asamples, end_sample - i, mq, unit, mq_flags); - start_sample = lsegment->get_sample_count(); - end_sample = asegment->get_sample_count(); + analog = dynamic_pointer_cast(packet->payload()); - if (end_sample > start_sample) { - tie(min_value_, max_value_) = asegment->get_min_max(); + asegment->get_samples(i, end_sample, asamples); + shared_ptr logic = + analog->get_logic_via_threshold(threshold, lsamples); + lsegment->append_payload(logic->data_pointer(), logic->data_length()); + samples_added(lsegment->segment_id(), i, end_sample); + } - // Create sigrok::Analog instance - float *asamples = new float[ConversionBlockSize]; - uint8_t *lsamples = new uint8_t[ConversionBlockSize]; + if (conversion_type_ == A2LConversionBySchmittTrigger) { + const vector thresholds = get_conversion_thresholds(); + const double lo_thr = thresholds[0]; + const double hi_thr = thresholds[1]; - vector > channels; - channels.push_back(channel_); + uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0 - vector mq_flags; - const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE; - const sigrok::Unit * const unit = sigrok::Unit::VOLT; + // Convert as many sample blocks as we can + while ((end_sample - i) > ConversionBlockSize) { + asegment->get_samples(i, i + ConversionBlockSize, asamples); - shared_ptr packet = - Session::sr_context->create_analog_packet(channels, - asamples, ConversionBlockSize, mq, unit, mq_flags); + shared_ptr logic = + analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, + &state, lsamples); - shared_ptr analog = - dynamic_pointer_cast(packet->payload()); + lsegment->append_payload(logic->data_pointer(), logic->data_length()); + samples_added(lsegment->segment_id(), i, i + ConversionBlockSize); + i += ConversionBlockSize; + } + + // Re-create sigrok::Analog and convert remaining samples + packet = Session::sr_context->create_analog_packet(channels, + asamples, end_sample - i, mq, unit, mq_flags); + + analog = dynamic_pointer_cast(packet->payload()); + + asegment->get_samples(i, end_sample, asamples); + shared_ptr logic = + analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, + &state, lsamples); + lsegment->append_payload(logic->data_pointer(), logic->data_length()); + samples_added(lsegment->segment_id(), i, end_sample); + } - // Convert - uint64_t i = start_sample; + // If acquisition is ongoing, start-/endsample may have changed + end_sample = asegment->get_sample_count(); - if (conversion_type_ == A2LConversionByThreshold) { - const double threshold = get_conversion_thresholds()[0]; + delete[] lsamples; + delete[] asamples; + } +} - // Convert as many sample blocks as we can - while ((end_sample - i) > ConversionBlockSize) { - asegment->get_samples(i, i + ConversionBlockSize, asamples); +void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment) +{ + uint64_t start_sample, end_sample, old_end_sample; + start_sample = end_sample = 0; + bool complete_state, old_complete_state; - shared_ptr logic = - analog->get_logic_via_threshold(threshold, lsamples); + start_sample = lsegment->get_sample_count(); + end_sample = asegment->get_sample_count(); + complete_state = asegment->is_complete(); - lsegment->append_payload(logic->data_pointer(), logic->data_length()); + // Don't do anything if the segment is still being filled and the sample count is too small + if ((!complete_state) && (end_sample - start_sample < ConversionBlockSize)) + return; - samples_added(lsegment, i, i + ConversionBlockSize); - i += ConversionBlockSize; - } + do { + convert_single_segment_range(asegment, lsegment, start_sample, end_sample); - // Re-create sigrok::Analog and convert remaining samples - packet = Session::sr_context->create_analog_packet(channels, - asamples, end_sample - i, mq, unit, mq_flags); + old_end_sample = end_sample; + old_complete_state = complete_state; - analog = dynamic_pointer_cast(packet->payload()); + start_sample = lsegment->get_sample_count(); + end_sample = asegment->get_sample_count(); + complete_state = asegment->is_complete(); - asegment->get_samples(i, end_sample, asamples); - shared_ptr logic = - analog->get_logic_via_threshold(threshold, lsamples); - lsegment->append_payload(logic->data_pointer(), logic->data_length()); - samples_added(lsegment, i, end_sample); - } + // If the segment has been incomplete when we were called and has been + // completed in the meanwhile, we convert the remaining samples as well. + // Also, if a sufficient number of samples was added in the meanwhile, + // we do another round of sample conversion. + } while ((complete_state != old_complete_state) || + (end_sample - old_end_sample >= ConversionBlockSize)); +} - if (conversion_type_ == A2LConversionBySchmittTrigger) { - const vector thresholds = get_conversion_thresholds(); - const double lo_thr = thresholds[0]; - const double hi_thr = thresholds[1]; +void SignalBase::conversion_thread_proc() +{ + shared_ptr analog_data; - uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 0 + if (conversion_is_a2l()) { + analog_data = dynamic_pointer_cast(data_); - // Convert as many sample blocks as we can - while ((end_sample - i) > ConversionBlockSize) { - asegment->get_samples(i, i + ConversionBlockSize, asamples); + if (analog_data->analog_segments().size() == 0) { + unique_lock input_lock(conversion_input_mutex_); + conversion_input_cond_.wait(input_lock); + } - shared_ptr logic = - analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, - &state, lsamples); + } else + // Currently, we only handle A2L conversions + return; - lsegment->append_payload(logic->data_pointer(), logic->data_length()); + // If we had to wait for input data, we may have been notified to terminate + if (conversion_interrupt_) + return; - samples_added(lsegment, i, i + ConversionBlockSize); - i += ConversionBlockSize; - } + uint32_t segment_id = 0; - // Re-create sigrok::Analog and convert remaining samples - packet = Session::sr_context->create_analog_packet(channels, - asamples, end_sample - i, mq, unit, mq_flags); + AnalogSegment *asegment = analog_data->analog_segments().front().get(); + assert(asegment); - analog = dynamic_pointer_cast(packet->payload()); + const shared_ptr logic_data = dynamic_pointer_cast(converted_data_); + assert(logic_data); - asegment->get_samples(i, end_sample, asamples); - shared_ptr logic = - analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, - &state, lsamples); - lsegment->append_payload(logic->data_pointer(), logic->data_length()); - samples_added(lsegment, i, end_sample); - } + // Create the initial logic data segment if needed + if (logic_data->logic_segments().size() == 0) { + shared_ptr new_segment = + make_shared(*logic_data.get(), 0, 1, asegment->samplerate()); + logic_data->push_segment(new_segment); + } - // If acquisition is ongoing, start-/endsample may have changed - end_sample = asegment->get_sample_count(); + LogicSegment *lsegment = logic_data->logic_segments().front().get(); + assert(lsegment); - delete[] lsamples; - delete[] asamples; + do { + convert_single_segment(asegment, lsegment); + + // Only advance to next segment if the current input segment is complete + if (asegment->is_complete() && + analog_data->analog_segments().size() > logic_data->logic_segments().size()) { + // There are more segments to process + segment_id++; + + try { + asegment = analog_data->analog_segments().at(segment_id).get(); + } catch (out_of_range&) { + qDebug() << "Conversion error for" << name() << ": no analog segment" \ + << segment_id << ", segments size is" << analog_data->analog_segments().size(); + return; } - } - if (!conversion_interrupt_ && (start_sample == end_sample)) { - unique_lock input_lock(conversion_input_mutex_); - conversion_input_cond_.wait(input_lock); + shared_ptr new_segment = make_shared( + *logic_data.get(), segment_id, 1, asegment->samplerate()); + logic_data->push_segment(new_segment); + + lsegment = logic_data->logic_segments().back().get(); + } else { + // No more samples/segments to process, wait for data or interrupt + if (!conversion_interrupt_) { + unique_lock input_lock(conversion_input_mutex_); + conversion_input_cond_.wait(input_lock); + } } } while (!conversion_interrupt_); } -void SignalBase::start_conversion() +void SignalBase::start_conversion(bool delayed_start) { + if (delayed_start) { + delayed_conversion_starter_.start(); + return; + } + stop_conversion(); if (converted_data_) converted_data_->clear(); + samples_cleared(); - if (conversion_is_a2l()) { - shared_ptr analog_data = dynamic_pointer_cast(data_); - - if (analog_data->analog_segments().size() > 0) { - // TODO Support for multiple segments is missing - AnalogSegment *asegment = analog_data->analog_segments().front().get(); - - conversion_interrupt_ = false; - conversion_thread_ = std::thread( - &SignalBase::conversion_thread_proc, this, asegment); - } - } + conversion_interrupt_ = false; + conversion_thread_ = std::thread( + &SignalBase::conversion_thread_proc, this); } void SignalBase::stop_conversion() @@ -568,23 +708,24 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample, // Notify the conversion thread since it's running conversion_input_cond_.notify_one(); } else { - // Start the conversion thread - start_conversion(); + // Start the conversion thread unless the delay timer is running + if (!delayed_conversion_starter_.isActive()) + start_conversion(); } } - samples_added(segment, start_sample, end_sample); + data::Segment* s = qobject_cast(segment); + samples_added(s->segment_id(), start_sample, end_sample); } void SignalBase::on_min_max_changed(float min, float max) { - (void)min; - (void)max; - // Restart conversion if one is enabled and uses a calculated threshold if ((conversion_type_ != NoConversion) && (get_current_conversion_preset() == DynamicPreset)) - start_conversion(); + start_conversion(true); + + min_max_changed(min, max); } void SignalBase::on_capture_state_changed(int state) @@ -596,5 +737,10 @@ void SignalBase::on_capture_state_changed(int state) } } +void SignalBase::on_delayed_conversion_start() +{ + start_conversion(); +} + } // namespace data } // namespace pv