X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=5aec9ba884677e924cb8e0d1d533a62c4ef467b2;hp=b455111a89fbbd868dde6e92198dc1418a564153;hb=b5d20c6d003d853ad0828d15b365988519e73e88;hpb=b9cdbe03be1155f56cf06aa921d72bc2b6dc527d diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index b455111a..5aec9ba8 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_) @@ -140,6 +157,14 @@ void SignalBase::set_data(shared_ptr data) this, SLOT(on_samples_cleared())); disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + + if (channel_type_ == AnalogChannel) { + shared_ptr analog = analog_data(); + assert(analog); + + disconnect(analog.get(), SIGNAL(min_max_changed(float, float)), + this, SLOT(on_min_max_changed(float, float))); + } } data_ = data; @@ -149,6 +174,14 @@ void SignalBase::set_data(shared_ptr data) this, SLOT(on_samples_cleared())); connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + + if (channel_type_ == AnalogChannel) { + shared_ptr analog = analog_data(); + assert(analog); + + connect(analog.get(), SIGNAL(min_max_changed(float, float)), + this, SLOT(on_min_max_changed(float, float))); + } } } @@ -176,6 +209,35 @@ 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; +} + SignalBase::ConversionType SignalBase::get_conversion_type() const { return conversion_type_; @@ -228,33 +290,33 @@ vector SignalBase::get_conversion_thresholds(const ConversionType t, { vector result; ConversionType conv_type = t; - int preset; + ConversionPreset preset; // Use currently active conversion if no conversion type was supplied if (conv_type == NoConversion) conv_type = conversion_type_; if (always_custom) - preset = -1; + preset = NoPreset; else preset = get_current_conversion_preset(); if (conv_type == A2LConversionByThreshold) { double thr = 0; - if (preset == -1) { + if (preset == NoPreset) { auto thr_iter = conversion_options_.find("threshold_value"); if (thr_iter != conversion_options_.end()) thr = (thr_iter->second).toDouble(); } - if (preset == 0) + if (preset == DynamicPreset) thr = (min_value_ + max_value_) * 0.5; // middle between min and max - if (preset == 1) thr = 0.9; - if (preset == 2) thr = 1.8; - if (preset == 3) thr = 2.5; - if (preset == 4) thr = 1.5; + if ((int)preset == 1) thr = 0.9; + if ((int)preset == 2) thr = 1.8; + if ((int)preset == 3) thr = 2.5; + if ((int)preset == 4) thr = 1.5; result.push_back(thr); } @@ -262,7 +324,7 @@ vector SignalBase::get_conversion_thresholds(const ConversionType t, if (conv_type == A2LConversionBySchmittTrigger) { double thr_lo = 0, thr_hi = 0; - if (preset == -1) { + if (preset == NoPreset) { auto thr_lo_iter = conversion_options_.find("threshold_value_low"); if (thr_lo_iter != conversion_options_.end()) thr_lo = (thr_lo_iter->second).toDouble(); @@ -272,17 +334,17 @@ vector SignalBase::get_conversion_thresholds(const ConversionType t, thr_hi = (thr_hi_iter->second).toDouble(); } - if (preset == 0) { + if (preset == DynamicPreset) { const double amplitude = max_value_ - min_value_; const double center = min_value_ + (amplitude / 2); thr_lo = center - (amplitude * 0.15); // 15% margin thr_hi = center + (amplitude * 0.15); // 15% margin } - if (preset == 1) { thr_lo = 0.3; thr_hi = 1.2; } - if (preset == 2) { thr_lo = 0.7; thr_hi = 2.5; } - if (preset == 3) { thr_lo = 1.3; thr_hi = 3.7; } - if (preset == 4) { thr_lo = 0.8; thr_hi = 2.0; } + if ((int)preset == 1) { thr_lo = 0.3; thr_hi = 1.2; } + if ((int)preset == 2) { thr_lo = 0.7; thr_hi = 2.5; } + if ((int)preset == 3) { thr_lo = 1.3; thr_hi = 3.7; } + if ((int)preset == 4) { thr_lo = 0.8; thr_hi = 2.0; } result.push_back(thr_lo); result.push_back(thr_hi); @@ -316,18 +378,18 @@ vector< pair > SignalBase::get_conversion_presets() const return presets; } -int SignalBase::get_current_conversion_preset() const +SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const { auto preset = conversion_options_.find("preset"); if (preset != conversion_options_.end()) - return (preset->second).toInt(); + return (ConversionPreset)((preset->second).toInt()); - return -1; + return DynamicPreset; } -void SignalBase::set_conversion_preset(int id) +void SignalBase::set_conversion_preset(ConversionPreset id) { - conversion_options_["preset"] = id; + conversion_options_["preset"] = (int)id; } #ifdef ENABLE_DECODE @@ -377,154 +439,194 @@ bool SignalBase::conversion_is_a2l() const (conversion_type_ == A2LConversionBySchmittTrigger))); } -void SignalBase::conversion_thread_proc(QObject* segment) +void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment) { - // TODO Support for multiple segments is missing - uint64_t start_sample, end_sample; start_sample = end_sample = 0; - do { - if (conversion_is_a2l()) { + start_sample = lsegment->get_sample_count(); + end_sample = asegment->get_sample_count(); - AnalogSegment *asegment = qobject_cast(segment); + if (end_sample > start_sample) { + tie(min_value_, max_value_) = asegment->get_min_max(); - const shared_ptr logic_data = dynamic_pointer_cast(converted_data_); + // Create sigrok::Analog instance + float *asamples = new float[ConversionBlockSize]; + uint8_t *lsamples = new uint8_t[ConversionBlockSize]; - // 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); - } + vector > channels; + channels.push_back(channel_); - LogicSegment *lsegment = dynamic_cast(logic_data->segments().front().get()); + vector mq_flags; + const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE; + const sigrok::Unit * const unit = sigrok::Unit::VOLT; - start_sample = lsegment->get_sample_count(); - end_sample = asegment->get_sample_count(); + shared_ptr packet = + Session::sr_context->create_analog_packet(channels, + asamples, ConversionBlockSize, mq, unit, mq_flags); - if (end_sample > start_sample) { - tie(min_value_, max_value_) = asegment->get_min_max(); + shared_ptr analog = + dynamic_pointer_cast(packet->payload()); - // Create sigrok::Analog instance - float *asamples = new float[ConversionBlockSize]; - uint8_t *lsamples = new uint8_t[ConversionBlockSize]; + // Convert + uint64_t i = start_sample; - vector > channels; - channels.push_back(channel_); + if (conversion_type_ == A2LConversionByThreshold) { + const double threshold = get_conversion_thresholds()[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_threshold(threshold, lsamples); - shared_ptr analog = - dynamic_pointer_cast(packet->payload()); + lsegment->append_payload(logic->data_pointer(), logic->data_length()); - // Convert - uint64_t i = start_sample; + samples_added(lsegment, i, i + ConversionBlockSize); + i += ConversionBlockSize; + } - if (conversion_type_ == A2LConversionByThreshold) { - const double threshold = get_conversion_thresholds()[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); - // Convert as many sample blocks as we can - while ((end_sample - i) > ConversionBlockSize) { - asegment->get_samples(i, i + ConversionBlockSize, asamples); + analog = dynamic_pointer_cast(packet->payload()); - shared_ptr logic = - analog->get_logic_via_threshold(threshold, lsamples); + 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); + } - lsegment->append_payload(logic->data_pointer(), logic->data_length()); + if (conversion_type_ == A2LConversionBySchmittTrigger) { + const vector thresholds = get_conversion_thresholds(); + const double lo_thr = thresholds[0]; + const double hi_thr = thresholds[1]; - samples_added(lsegment, i, i + ConversionBlockSize); - i += ConversionBlockSize; - } + uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 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); + // Convert as many sample blocks as we can + while ((end_sample - i) > ConversionBlockSize) { + asegment->get_samples(i, i + ConversionBlockSize, asamples); - analog = dynamic_pointer_cast(packet->payload()); + shared_ptr logic = + analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, + &state, lsamples); - 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); - } + lsegment->append_payload(logic->data_pointer(), logic->data_length()); - if (conversion_type_ == A2LConversionBySchmittTrigger) { - const vector thresholds = get_conversion_thresholds(); - const double lo_thr = thresholds[0]; - const double hi_thr = thresholds[1]; + samples_added(lsegment, i, i + ConversionBlockSize); + i += ConversionBlockSize; + } - uint8_t state = 0; // TODO Use value of logic sample n-1 instead of 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); - // Convert as many sample blocks as we can - while ((end_sample - i) > ConversionBlockSize) { - asegment->get_samples(i, i + ConversionBlockSize, asamples); + analog = dynamic_pointer_cast(packet->payload()); - shared_ptr logic = - analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr, - &state, lsamples); + 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); + } - lsegment->append_payload(logic->data_pointer(), logic->data_length()); + // If acquisition is ongoing, start-/endsample may have changed + end_sample = asegment->get_sample_count(); - samples_added(lsegment, i, i + ConversionBlockSize); - i += ConversionBlockSize; - } + delete[] lsamples; + delete[] asamples; + } +} - // Re-create sigrok::Analog and convert remaining samples - packet = Session::sr_context->create_analog_packet(channels, - asamples, end_sample - i, mq, unit, mq_flags); +void SignalBase::conversion_thread_proc() +{ + shared_ptr analog_data; - analog = dynamic_pointer_cast(packet->payload()); + if (conversion_is_a2l()) { + analog_data = dynamic_pointer_cast(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); - } + if (analog_data->analog_segments().size() == 0) { + unique_lock input_lock(conversion_input_mutex_); + conversion_input_cond_.wait(input_lock); + } + + } else + // Currently, we only handle A2L conversions + return; + + // If we had to wait for input data, we may have been notified to terminate + if (conversion_interrupt_) + return; + + uint32_t segment_id = 0; + + AnalogSegment *asegment = analog_data->analog_segments().front().get(); + assert(asegment); + + const shared_ptr logic_data = dynamic_pointer_cast(converted_data_); + assert(logic_data); + + // 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); + + if (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 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() @@ -552,24 +654,38 @@ 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); } +void SignalBase::on_min_max_changed(float min, float max) +{ + // Restart conversion if one is enabled and uses a calculated threshold + if ((conversion_type_ != NoConversion) && + (get_current_conversion_preset() == DynamicPreset)) + start_conversion(true); + + min_max_changed(min, max); +} + void SignalBase::on_capture_state_changed(int state) { if (state == Session::Running) { - if (conversion_type_ != NoConversion) { - // Restart conversion - stop_conversion(); + // Restart conversion if one is enabled + if (conversion_type_ != NoConversion) start_conversion(); - } } } +void SignalBase::on_delayed_conversion_start() +{ + start_conversion(); +} + } // namespace data } // namespace pv