projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 167c79bd3cf2ef49e1e9db77a4f1070b38084aac..b34635319c934c1618a81bfd0bf961c82044df8b 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-18,50
+18,57
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <
boost/foreach.hpp
>
+#include <
cassert
>
-#include "logic.h"
-#include "logics
napshot.h
"
+#include "logic.h
pp
"
+#include "logics
egment.hpp
"
-using boost::shared_ptr;
using std::deque;
using std::max;
using std::deque;
using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Logic::Logic(unsigned int num_
probe
s) :
+Logic::Logic(unsigned int num_
channel
s) :
SignalData(),
SignalData(),
-
_num_probes(num_probe
s)
+
num_channels_(num_channel
s)
{
{
- assert(
_num_probes
> 0);
+ assert(
num_channels_
> 0);
}
}
-
int Logic::get_num_probe
s() const
+
unsigned int Logic::num_channel
s() const
{
{
- return
_num_probes
;
+ return
num_channels_
;
}
}
-void Logic::push_s
napsho
t(
- shared_ptr<LogicS
napshot> &snapsho
t)
+void Logic::push_s
egmen
t(
+ shared_ptr<LogicS
egment> &segmen
t)
{
{
-
_snapshots.push_front(snapsho
t);
+
segments_.push_front(segmen
t);
}
}
-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()
{
}
void Logic::clear()
{
-
_snapshots
.clear();
+
segments_
.clear();
}
}
-uint64_t Logic::
get_
max_sample_count() const
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
-
BOOST_FOREACH(boost::shared_ptr<LogicSnapshot> s, _snapshots
) {
+
for (std::shared_ptr<LogicSegment> s : segments_
) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}