projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Catch by reference
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.hpp
diff --git
a/pv/data/decode/annotation.hpp
b/pv/data/decode/annotation.hpp
index 42a291a2134a5d7eb439b6a2c7dda7ffcac1238d..8b91c4f47e066605e307ed0301fbd1871d59436d 100644
(file)
--- a/
pv/data/decode/annotation.hpp
+++ b/
pv/data/decode/annotation.hpp
@@
-33,21
+33,30
@@
namespace pv {
namespace data {
namespace decode {
namespace data {
namespace decode {
+class Row;
+
class Annotation
{
public:
class Annotation
{
public:
- Annotation(const srd_proto_data *const pdata);
+ typedef uint32_t Class;
+
+public:
+ Annotation(const srd_proto_data *const pdata, const Row *row);
uint64_t start_sample() const;
uint64_t end_sample() const;
uint64_t start_sample() const;
uint64_t end_sample() const;
-
int format
() const;
+
Class ann_class
() const;
const vector<QString>& annotations() const;
const vector<QString>& annotations() const;
+ const Row* row() const;
+
+ bool operator<(const Annotation &other) const;
private:
uint64_t start_sample_;
uint64_t end_sample_;
private:
uint64_t start_sample_;
uint64_t end_sample_;
-
int format
_;
+
Class ann_class
_;
vector<QString> annotations_;
vector<QString> annotations_;
+ const Row *row_;
};
} // namespace decode
};
} // namespace decode