X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.cpp;h=73a3084dde3c1b8afdb2df57f8c24d7eb24003e0;hb=5cb28675542489f9c694b0002ec27694073e9687;hp=6dc2b915b30c4683f766bf97da4f662c44a9c07d;hpb=b21501d694e68a8c41ea1b7bd1fecd7c7a70eadd;p=pulseview.git diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp index 6dc2b915..73a3084d 100644 --- a/pv/data/analogsegment.cpp +++ b/pv/data/analogsegment.cpp @@ -48,8 +48,8 @@ const int AnalogSegment::EnvelopeScaleFactor = 1 << EnvelopeScalePower; const float AnalogSegment::LogEnvelopeScaleFactor = logf(EnvelopeScaleFactor); const uint64_t AnalogSegment::EnvelopeDataUnit = 64 * 1024; // bytes -AnalogSegment::AnalogSegment(Analog& owner, uint64_t samplerate) : - Segment(samplerate, sizeof(float)), +AnalogSegment::AnalogSegment(Analog& owner, uint32_t segment_id, uint64_t samplerate) : + Segment(segment_id, samplerate, sizeof(float)), owner_(owner), min_value_(0), max_value_(0) @@ -75,7 +75,7 @@ void AnalogSegment::append_interleaved_samples(const float *data, uint64_t prev_sample_count = sample_count_; // Deinterleave the samples and add them - unique_ptr deint_data(new float[sample_count]); + unique_ptr deint_data(new float[sample_count]); float *deint_data_ptr = deint_data.get(); for (uint32_t i = 0; i < sample_count; i++) { *deint_data_ptr = (float)(*data); @@ -178,6 +178,7 @@ void AnalogSegment::append_payload_to_envelope_levels() e0.length = sample_count_ / EnvelopeScaleFactor; // Calculate min/max values in case we have too few samples for an envelope + const float old_min_value = min_value_, old_max_value = max_value_; if (sample_count_ < EnvelopeScaleFactor) { it = begin_raw_sample_iteration(0); for (uint64_t i = 0; i < sample_count_; i++) { @@ -257,6 +258,10 @@ void AnalogSegment::append_payload_to_envelope_levels() *dest_ptr = sub_sample; } } + + // Notify if the min or max value changed + if ((old_min_value != min_value_) || (old_max_value != max_value_)) + owner_.min_max_changed(min_value_, max_value_); } } // namespace data