projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSegment: Check upper bound when performing edge search
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 96a594c3c6ce57a07f621ce9ddf9cd439fed1acd..e983b0df1c3e971ba7942c9ccadb86ed10e09bbb 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-32,9
+32,10
@@
namespace pv {
namespace data {
namespace decode {
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 =
{
assert(pdata);
const srd_proto_data_annotation *const pda =
@@
-70,6
+71,16
@@
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