Modified header guards to match file names

[pulseview.git] / pv / data / logic.cpp

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 8f1d294d5c7e9c27f10de34e960d1c9ee6f5570f..fe29aea4f0175ba1f9878560ebb3ef4cad66eb8c 100644 (file)
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -21,11 +21,12 @@
 #include <cassert>
 
 #include "logic.hpp"
-#include "logicsnapshot.hpp"
+#include "logicsegment.hpp"
 
 using std::deque;
 using std::max;
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -42,26 +43,32 @@ int Logic::get_num_channels() const
        return num_channels_;
 }
 
-void Logic::push_snapshot(
-       shared_ptr<LogicSnapshot> &snapshot)
+void Logic::push_segment(
+       shared_ptr<LogicSegment> &segment)
 {
-       snapshots_.push_front(snapshot);
+       segments_.push_front(segment);
 }
 
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 {
-       return snapshots_;
+       return segments_;
+}
+
+vector< shared_ptr<Segment> > Logic::segments() const
+{
+       return vector< shared_ptr<Segment> >(
+               segments_.begin(), segments_.end());
 }
 
 void Logic::clear()
 {
-       snapshots_.clear();
+       segments_.clear();
 }
 
 uint64_t Logic::get_max_sample_count() const
 {
        uint64_t l = 0;
-       for (std::shared_ptr<LogicSnapshot> s : snapshots_) {
+       for (std::shared_ptr<LogicSegment> s : segments_) {
                assert(s);
                l = max(l, s->get_sample_count());
        }