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.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index e47f8f03732ca82929ae6489755f4089f3519665..e983b0df1c3e971ba7942c9ccadb86ed10e09bbb 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-26,20
+26,23
@@
extern "C" {
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
-Annotation::Annotation(const srd_proto_data *const pdata) :
+Annotation::Annotation(const srd_proto_data *const pdata
, const Row *row
) :
start_sample_(pdata->start_sample),
start_sample_(pdata->start_sample),
- end_sample_(pdata->end_sample)
+ end_sample_(pdata->end_sample),
+ row_(row)
{
assert(pdata);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
{
assert(pdata);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
-
format_ = pda->ann_class
;
+
ann_class_ = (Class)(pda->ann_class)
;
const char *const *annotations = (char**)pda->ann_text;
while (*annotations) {
const char *const *annotations = (char**)pda->ann_text;
while (*annotations) {
@@
-58,16
+61,26
@@
uint64_t Annotation::end_sample() const
return end_sample_;
}
return end_sample_;
}
-
int Annotation::format
() const
+
Annotation::Class Annotation::ann_class
() const
{
{
- return
format
_;
+ return
ann_class
_;
}
}
-const
std::
vector<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
{
return annotations_;
}
{
return annotations_;
}
+const Row* Annotation::row() const
+{
+ return row_;
+}
+
+bool Annotation::operator<(const Annotation &other) const
+{
+ return (start_sample_ < other.start_sample_);
+}
+
} // namespace decode
} // namespace data
} // namespace pv
} // namespace decode
} // namespace data
} // namespace pv