projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use <cmath> in favor of <math.h> everywhere.
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 78fd70e8750de70465160ba863bed89529cd6388..c95fffaf247518454b065ef9775cb5dcab8a2447 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-20,12
+20,13
@@
#include <cassert>
#include <cassert>
-#include "analog.h"
-#include "analogs
napshot.h
"
+#include "analog.h
pp
"
+#include "analogs
egment.hpp
"
using std::deque;
using std::max;
using std::shared_ptr;
using std::deque;
using std::max;
using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-35,25
+36,31
@@
Analog::Analog() :
{
}
{
}
-void Analog::push_s
napshot(shared_ptr<AnalogSnapshot> &snapsho
t)
+void Analog::push_s
egment(shared_ptr<AnalogSegment> &segmen
t)
{
{
-
_snapshots.push_front(snapsho
t);
+
segments_.push_front(segmen
t);
}
}
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
{
{
- return _snapshots;
+ return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
+{
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
}
void Analog::clear()
{
}
void Analog::clear()
{
-
_snapshots
.clear();
+
segments_
.clear();
}
uint64_t Analog::get_max_sample_count() const
{
uint64_t l = 0;
}
uint64_t Analog::get_max_sample_count() const
{
uint64_t l = 0;
- for (const std::shared_ptr<AnalogS
napshot> s : _snapshots
) {
+ for (const std::shared_ptr<AnalogS
egment> s : segments_
) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}