projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework the callback mechanism for the global settings
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 399c81349c3087ceea417a0e75a610f436e49c59..e78c28468d71ef42da07e7e0eb102076889cfd38 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-42,10
+42,9
@@
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_
back
(segment);
}
const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
}
const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
@@
-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());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
}
void Logic::clear()
}
void Logic::clear()