X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=96f0d1fe7e63afe40bd8a23f8124eae698ab413d;hb=99503171d4f32570829df171521b4b9cbccb0503;hp=6addea3b10a4440ec84357dd2d3fe47bc5ff1590;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;p=pulseview.git

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 6addea3..96f0d1f 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -20,48 +20,55 @@
 
 #include <cassert>
 
-#include "logic.h"
-#include "logicsnapshot.h"
+#include "logic.hpp"
+#include "logicsnapshot.hpp"
 
 using std::deque;
 using std::max;
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
 
-Logic::Logic(unsigned int num_probes) :
+Logic::Logic(unsigned int num_channels) :
 	SignalData(),
-	_num_probes(num_probes)
+	num_channels_(num_channels)
 {
-	assert(_num_probes > 0);
+	assert(num_channels_ > 0);
 }
 
-int Logic::get_num_probes() const
+int Logic::get_num_channels() const
 {
-	return _num_probes;
+	return num_channels_;
 }
 
 void Logic::push_snapshot(
 	shared_ptr<LogicSnapshot> &snapshot)
 {
-	_snapshots.push_front(snapshot);
+	snapshots_.push_front(snapshot);
 }
 
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+const deque< shared_ptr<LogicSnapshot> >& Logic::logic_snapshots() const
 {
-	return _snapshots;
+	return snapshots_;
+}
+
+vector< shared_ptr<Snapshot> > Logic::snapshots() const
+{
+	return vector< shared_ptr<Snapshot> >(
+		snapshots_.begin(), snapshots_.end());
 }
 
 void Logic::clear()
 {
-	_snapshots.clear();
+	snapshots_.clear();
 }
 
 uint64_t Logic::get_max_sample_count() const
 {
 	uint64_t l = 0;
-	for (std::shared_ptr<LogicSnapshot> s : _snapshots) {
+	for (std::shared_ptr<LogicSnapshot> s : snapshots_) {
 		assert(s);
 		l = max(l, s->get_sample_count());
 	}