X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=791094036ddcb23511329a9922c67f1774fa0268;hp=9f47a9755eee6fc6ec085e3a831fb51062971183;hb=f20e9bfdf03694ddb13b8b955964527358e52c67;hpb=63253d727162257aa0a3765bfb897c6826ebf611 diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 9f47a975..79109403 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -41,7 +41,7 @@ using std::unique_lock; namespace pv { namespace data { -const int SignalBase::ColourBGAlpha = 8 * 256 / 100; +const int SignalBase::ColorBGAlpha = 8 * 256 / 100; const uint64_t SignalBase::ConversionBlockSize = 4096; const uint32_t SignalBase::ConversionDelay = 1000; // 1 second @@ -81,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_) @@ -122,24 +130,24 @@ unsigned int SignalBase::logic_bit_index() const return 0; } -QColor SignalBase::colour() const +QColor SignalBase::color() const { - return colour_; + return color_; } -void SignalBase::set_colour(QColor colour) +void SignalBase::set_color(QColor color) { - colour_ = colour; + color_ = color; - bgcolour_ = colour; - bgcolour_.setAlpha(ColourBGAlpha); + bgcolor_ = color; + bgcolor_.setAlpha(ColorBGAlpha); - colour_changed(colour); + color_changed(color); } -QColor SignalBase::bgcolour() const +QColor SignalBase::bgcolor() const { - return bgcolour_; + return bgcolor_; } void SignalBase::set_data(shared_ptr data) @@ -201,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_; @@ -366,7 +430,7 @@ void SignalBase::save_settings(QSettings &settings) const { settings.setValue("name", name()); settings.setValue("enabled", enabled()); - settings.setValue("colour", colour()); + settings.setValue("color", color()); settings.setValue("conversion_type", (int)conversion_type_); settings.setValue("conv_options", (int)(conversion_options_.size())); @@ -380,18 +444,30 @@ void SignalBase::save_settings(QSettings &settings) const void SignalBase::restore_settings(QSettings &settings) { - set_name(settings.value("name").toString()); - set_enabled(settings.value("enabled").toBool()); - set_colour(settings.value("colour").value()); - set_conversion_type((ConversionType)settings.value("conversion_type").toInt()); + if (settings.contains("name")) + set_name(settings.value("name").toString()); + + if (settings.contains("enabled")) + set_enabled(settings.value("enabled").toBool()); - int conv_options = settings.value("conv_options").toInt(); + if (settings.contains("color")) + set_color(settings.value("color").value()); + + if (settings.contains("conversion_type")) + set_conversion_type((ConversionType)settings.value("conversion_type").toInt()); + + int conv_options = 0; + if (settings.contains("conv_options")) + conv_options = settings.value("conv_options").toInt(); if (conv_options) for (int i = 0; i < conv_options; i++) { - QString key = settings.value(QString("conv_option%1_key").arg(i)).toString(); - QVariant value = settings.value(QString("conv_option%1_value").arg(i)); - conversion_options_[key] = value; + const QString key_id = QString("conv_option%1_key").arg(i); + const QString value_id = QString("conv_option%1_value").arg(i); + + if (settings.contains(key_id) && settings.contains(value_id)) + conversion_options_[settings.value(key_id).toString()] = + settings.value(value_id); } } @@ -402,14 +478,9 @@ bool SignalBase::conversion_is_a2l() const (conversion_type_ == A2LConversionBySchmittTrigger))); } -void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment) +void SignalBase::convert_single_segment_range(AnalogSegment *asegment, + LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample) { - uint64_t start_sample, end_sample; - start_sample = end_sample = 0; - - start_sample = lsegment->get_sample_count(); - end_sample = asegment->get_sample_count(); - if (end_sample > start_sample) { tie(min_value_, max_value_) = asegment->get_min_max(); @@ -445,8 +516,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l analog->get_logic_via_threshold(threshold, lsamples); lsegment->append_payload(logic->data_pointer(), logic->data_length()); - - samples_added(lsegment, i, i + ConversionBlockSize); + samples_added(lsegment->segment_id(), i, i + ConversionBlockSize); i += ConversionBlockSize; } @@ -460,7 +530,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l 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); + samples_added(lsegment->segment_id(), i, end_sample); } if (conversion_type_ == A2LConversionBySchmittTrigger) { @@ -479,8 +549,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l &state, lsamples); lsegment->append_payload(logic->data_pointer(), logic->data_length()); - - samples_added(lsegment, i, i + ConversionBlockSize); + samples_added(lsegment->segment_id(), i, i + ConversionBlockSize); i += ConversionBlockSize; } @@ -495,7 +564,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l 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); + samples_added(lsegment->segment_id(), i, end_sample); } // If acquisition is ongoing, start-/endsample may have changed @@ -506,6 +575,38 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l } } +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; + + start_sample = lsegment->get_sample_count(); + end_sample = asegment->get_sample_count(); + complete_state = asegment->is_complete(); + + // 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; + + do { + convert_single_segment_range(asegment, lsegment, start_sample, end_sample); + + old_end_sample = end_sample; + old_complete_state = complete_state; + + start_sample = lsegment->get_sample_count(); + end_sample = asegment->get_sample_count(); + complete_state = asegment->is_complete(); + + // 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)); +} + void SignalBase::conversion_thread_proc() { shared_ptr analog_data; @@ -513,13 +614,19 @@ void SignalBase::conversion_thread_proc() if (conversion_is_a2l()) { analog_data = dynamic_pointer_cast(data_); - if (analog_data->analog_segments().size() == 0) - return; + 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(); @@ -531,7 +638,7 @@ void SignalBase::conversion_thread_proc() // Create the initial logic data segment if needed if (logic_data->logic_segments().size() == 0) { shared_ptr new_segment = - make_shared(*logic_data.get(), 1, asegment->samplerate()); + make_shared(*logic_data.get(), 0, 1, asegment->samplerate()); logic_data->push_segment(new_segment); } @@ -541,25 +648,27 @@ void SignalBase::conversion_thread_proc() do { convert_single_segment(asegment, lsegment); - if (analog_data->analog_segments().size() > logic_data->logic_segments().size()) { + // 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) { + } catch (out_of_range&) { qDebug() << "Conversion error for" << name() << ": no analog segment" \ << segment_id << ", segments size is" << analog_data->analog_segments().size(); return; } - shared_ptr new_segment = - make_shared(*logic_data.get(), 1, asegment->samplerate()); + 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 + // 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); @@ -617,7 +726,8 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample, } } - 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)