projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace ann_format with ann_class.
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 573fefaffa8c0829bc1440e362203d15dc5065b5..16895851a2c4401432a3e028ef658f94118b363e 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-22,6
+22,7
@@
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
#include <libsigrokdecode/libsigrokdecode.h>
}
+#include <cassert>
#include <vector>
#include "annotation.h"
#include <vector>
#include "annotation.h"
@@
-39,8
+40,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- _format = pda->ann_format;
- _row = 0;
+ _format = pda->ann_class;
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
@@
-64,21
+64,11
@@
int Annotation::format() const
return _format;
}
return _format;
}
-int Annotation::row() const
-{
- return _row;
-}
-
const std::vector<QString>& Annotation::annotations() const
{
return _annotations;
}
const std::vector<QString>& Annotation::annotations() const
{
return _annotations;
}
-void Annotation::set_row(int row)
-{
- _row = row;
-}
-
} // namespace decode
} // namespace data
} // namespace pv
} // namespace decode
} // namespace data
} // namespace pv