X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=c95fffaf247518454b065ef9775cb5dcab8a2447;hp=fadd5c696331ce95a0c79ee057b1d81b40d6434c;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=b087ba7fd88610cbf54f6371367c7b9f9829dc63

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index fadd5c69..c95fffaf 100644
--- 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
  */
 
-#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 {
@@ -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
+{
+	return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
 {
-	_snapshots.push_front(snapshot);
+	return vector< shared_ptr<Segment> >(
+		segments_.begin(), segments_.end());
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+void Analog::clear()
 {
-	return _snapshots;
+	segments_.clear();
 }
 
-void Analog::clear_snapshots()
+uint64_t Analog::get_max_sample_count() const
 {
-	_snapshots.clear();
+	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