projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor (Doxygen) comment cosmetics.
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 6e2f2db8413a2b9917f246aa59ad539dda574f29..ca2659b175815aa02e05711f4d22b5724bf768bd 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-18,11
+18,15
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "analog.h"
-#include "analogsnapshot.h"
+#include <cassert>
-using namespace boost;
-using namespace std;
+#include "analog.hpp"
+#include "analogsegment.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-32,19
+36,35
@@
Analog::Analog() :
{
}
{
}
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
+{
+ segments_.push_front(segment);
+}
+
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
{
{
-
_snapshots.push_front(snapshot)
;
+
return segments_
;
}
}
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+vector< shared_ptr<Segment> > Analog::segments() const
{
{
- return _snapshots;
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
}
void Analog::clear()
{
}
void Analog::clear()
{
- _snapshots.clear();
+ segments_.clear();
+}
+
+uint64_t Analog::max_sample_count() const
+{
+ uint64_t l = 0;
+ for (const std::shared_ptr<AnalogSegment> s : segments_) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
}
} // namespace data
}
} // namespace data