projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Removed BaselineOffset
[pulseview.git]
/
pv
/
data
/
logic.hpp
diff --git
a/pv/data/logic.hpp
b/pv/data/logic.hpp
index a51850719bbeba7e8c1355860a162bedce2acc8f..9adc9750bc8aa874849067c5eece2a6e939e4a8c 100644
(file)
--- a/
pv/data/logic.hpp
+++ b/
pv/data/logic.hpp
@@
-24,12
+24,11
@@
#include "signaldata.hpp"
#include <deque>
#include "signaldata.hpp"
#include <deque>
-#include <memory>
namespace pv {
namespace data {
namespace pv {
namespace data {
-class LogicS
napsho
t;
+class LogicS
egmen
t;
class Logic : public SignalData
{
class Logic : public SignalData
{
@@
-38,11
+37,13
@@
public:
int get_num_channels() const;
int get_num_channels() const;
- void push_s
napsho
t(
- std::shared_ptr<LogicS
napshot> &snapsho
t);
+ void push_s
egmen
t(
+ std::shared_ptr<LogicS
egment> &segmen
t);
- const std::deque< std::shared_ptr<LogicSnapshot> >&
- logic_snapshots() const;
+ const std::deque< std::shared_ptr<LogicSegment> >&
+ logic_segments() const;
+
+ std::vector< std::shared_ptr<Segment> > segments() const;
void clear();
void clear();
@@
-50,7
+51,7
@@
public:
private:
const unsigned int num_channels_;
private:
const unsigned int num_channels_;
- std::deque< std::shared_ptr<LogicS
napshot> > snapsho
ts_;
+ std::deque< std::shared_ptr<LogicS
egment> > segmen
ts_;
};
} // namespace data
};
} // namespace data