projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::view::DecodeTrace: Draw annotation rows according to PD metadata.
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index e17dcb5177cd73ab818d31e08a8c84d60133df15..573fefaffa8c0829bc1440e362203d15dc5065b5 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-22,9
+22,9
@@
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
#include <libsigrokdecode/libsigrokdecode.h>
}
-#include
"annotation.h"
+#include
<vector>
-using namespace std;
+#include "annotation.h"
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-40,6
+40,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
assert(pda);
_format = pda->ann_format;
assert(pda);
_format = pda->ann_format;
+ _row = 0;
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
@@
-63,11
+64,21
@@
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