projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Themes: Fix icon shift bug when opening QToolButton menu
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index c8bafc0fab292cf0982adc8b502739232ba11a56..f8fe473d3681ebc31f0850d052af2d952d8fbae4 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-37,7
+37,7
@@
Analog::Analog() :
void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
{
void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
{
- segments_.push_
front
(segment);
+ segments_.push_
back
(segment);
}
const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
}
const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
@@
-51,9
+51,9
@@
vector< shared_ptr<Segment> > Analog::segments() const
segments_.begin(), segments_.end());
}
segments_.begin(), segments_.end());
}
-
in
t Analog::get_segment_count() const
+
uint32_
t Analog::get_segment_count() const
{
{
- return segments_.size();
+ return
(uint32_t)
segments_.size();
}
void Analog::clear()
}
void Analog::clear()
@@
-63,10
+63,18
@@
void Analog::clear()
samples_cleared();
}
samples_cleared();
}
+double Analog::get_samplerate() const
+{
+ if (segments_.empty())
+ return 1.0;
+
+ return segments_.front()->samplerate();
+}
+
uint64_t Analog::max_sample_count() const
{
uint64_t l = 0;
uint64_t Analog::max_sample_count() const
{
uint64_t l = 0;
- for (const shared_ptr<AnalogSegment> s : segments_) {
+ for (const shared_ptr<AnalogSegment>
&
s : segments_) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}