pv::data::Logic: Renamed get_num_channels and fixed return types

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

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 2737bcb58238870b63066231778ca674c6231e25..3d7f27422a024d54e7970837c87d56c8a8bf3e2d 100644 (file)
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -18,48 +18,57 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "logic.h"
-#include "logicsnapshot.h"
+#include <cassert>
+
+#include "logic.hpp"
+#include "logicsegment.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_channels_ > 0);
+}
+
+unsigned int Logic::num_channels() const
 {
-       assert(_num_probes > 0);
+       return num_channels_;
 }
 
-int Logic::get_num_probes() const
+void Logic::push_segment(
+       shared_ptr<LogicSegment> &segment)
 {
-       return _num_probes;
+       segments_.push_front(segment);
 }
 
-void Logic::push_snapshot(
-       shared_ptr<LogicSnapshot> &snapshot)
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 {
-       _snapshots.push_front(snapshot);
+       return segments_;
 }
 
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+vector< shared_ptr<Segment> > Logic::segments() const
 {
-       return _snapshots;
+       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());
        }