X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=2972d4043cf7a7bb3e6b48b49e9b190589b92884;hp=018e4a2733fca8f813efeff6f9b9c0fd1dd6a9f6;hb=30677c1392b54604b01558cf29b44572731659fc;hpb=2b3dda54bb8e390e6a5d378c0e88f2bafacf0870 diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 018e4a27..2972d404 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -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_) @@ -211,7 +219,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const auto segments = data->analog_segments(); try { result = segments.at(segment_id)->is_complete(); - } catch (out_of_range) { + } catch (out_of_range&) { // Do nothing } } @@ -222,7 +230,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const auto segments = data->logic_segments(); try { result = segments.at(segment_id)->is_complete(); - } catch (out_of_range) { + } catch (out_of_range&) { // Do nothing } } @@ -431,14 +439,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(); @@ -474,8 +477,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; } @@ -489,7 +491,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) { @@ -508,8 +510,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; } @@ -524,7 +525,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 @@ -535,6 +536,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; @@ -566,7 +599,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); } @@ -576,25 +609,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); @@ -652,7 +687,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)