projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logicsegment.cpp: Minor whitespace fix.
[pulseview.git]
/
pv
/
data
/
decode
/
rowdata.hpp
diff --git
a/pv/data/decode/rowdata.hpp
b/pv/data/decode/rowdata.hpp
index f0e3534f7e2507cb54899a581b05d1d3b63f39c0..0589ec894eb444fad4f2d0d759c98a1eabc13fc7 100644
(file)
--- a/
pv/data/decode/rowdata.hpp
+++ b/
pv/data/decode/rowdata.hpp
@@
-22,35
+22,43
@@
#include <vector>
#include <vector>
+#include <libsigrokdecode/libsigrokdecode.h>
+
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
+class Row;
+
class RowData
{
public:
class RowData
{
public:
- RowData();
+ RowData()
= default
;
public:
uint64_t get_max_sample() const;
/**
public:
uint64_t get_max_sample() const;
/**
- * Extracts sorted annotations between two period into a vector.
+ * Extracts annotations between the given sample range into a vector.
+ * Note: The annotations are unsorted and only annotations that fully
+ * fit into the sample range are considered.
*/
void get_annotation_subset(
*/
void get_annotation_subset(
-
std::
vector<pv::data::decode::Annotation> &dest,
+ vector<pv::data::decode::Annotation> &dest,
uint64_t start_sample, uint64_t end_sample) const;
uint64_t start_sample, uint64_t end_sample) const;
- void
push_annotation(const Annotation &a
);
+ void
emplace_annotation(srd_proto_data *pdata, const Row *row
);
private:
private:
-
std::
vector<Annotation> annotations_;
+ vector<Annotation> annotations_;
};
};
-}
-}
//
data
-}
//
pv
+}
// namespace decode
+}
// namespace
data
+}
// namespace
pv
#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
#endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP