projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Binding: Add help icons for entries with descriptions
[pulseview.git]
/
pv
/
data
/
analogsegment.cpp
diff --git
a/pv/data/analogsegment.cpp
b/pv/data/analogsegment.cpp
index 0860177e6d9f6139b1ad15053527feeff0ca877b..73a3084dde3c1b8afdb2df57f8c24d7eb24003e0 100644
(file)
--- 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
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, uint
32_t segment_id, uint
64_t samplerate) :
+ Segment(s
egment_id, s
amplerate, sizeof(float)),
owner_(owner),
min_value_(0),
max_value_(0)
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
uint64_t prev_sample_count = sample_count_;
// Deinterleave the samples and add them
- unique_ptr<float> deint_data(new float[sample_count]);
+ unique_ptr<float
[]
> 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);
float *deint_data_ptr = deint_data.get();
for (uint32_t i = 0; i < sample_count; i++) {
*deint_data_ptr = (float)(*data);
@@
-102,7
+102,7
@@
void AnalogSegment::get_samples(int64_t start_sample, int64_t end_sample,
assert(start_sample >= 0);
assert(start_sample < (int64_t)sample_count_);
assert(end_sample >= 0);
assert(start_sample >= 0);
assert(start_sample < (int64_t)sample_count_);
assert(end_sample >= 0);
- assert(end_sample < (int64_t)sample_count_);
+ assert(end_sample <
=
(int64_t)sample_count_);
assert(start_sample <= end_sample);
assert(dest != nullptr);
assert(start_sample <= end_sample);
assert(dest != nullptr);
@@
-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
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++) {
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;
}
}
*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
}
} // namespace data