projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Break up annotation storage to allow multiple segments
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 399c81349c3087ceea417a0e75a610f436e49c59..084e8efd7f231fd920a0da8dfad18cfd9e4ac66e 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-42,8
+42,7
@@
unsigned int Logic::num_channels() const
return num_channels_;
}
return num_channels_;
}
-void Logic::push_segment(
- shared_ptr<LogicSegment> &segment)
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
{
segments_.push_front(segment);
}
{
segments_.push_front(segment);
}
@@
-55,8
+54,12
@@
const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
vector< shared_ptr<Segment> > Logic::segments() const
{
vector< shared_ptr<Segment> > Logic::segments() const
{
- return vector< shared_ptr<Segment> >(
- segments_.begin(), segments_.end());
+ return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
+}
+
+int Logic::get_segment_count() const
+{
+ return segments_.size();
}
void Logic::clear()
}
void Logic::clear()