projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GlobalSettings: Enable mouse hover marker by default
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index ed15867c2734d071ab843737284fc41f63aab208..da025882949ea8486638198fcb5fe124c22fa7ff 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-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,6
+63,14
@@
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;