projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SignalBase instead of LogicSignal for decoders
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index b8061cab08ea305c120b2a7c2a673c10fa0d016b..9a165803fe2381fa7d0d2a40459d1199b26cd1bf 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-22,52
+22,51
@@
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
#include <libsigrokdecode/libsigrokdecode.h>
}
+#include <cassert>
#include <vector>
#include <vector>
-#include "annotation.h"
-
-using namespace std;
+#include "annotation.hpp"
namespace pv {
namespace data {
namespace decode {
Annotation::Annotation(const srd_proto_data *const pdata) :
namespace pv {
namespace data {
namespace decode {
Annotation::Annotation(const srd_proto_data *const pdata) :
-
_start_sample
(pdata->start_sample),
-
_end_sample
(pdata->end_sample)
+
start_sample_
(pdata->start_sample),
+
end_sample_
(pdata->end_sample)
{
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_format
;
+
format_ = pda->ann_class
;
const char *const *annotations = (char**)pda->ann_text;
const char *const *annotations = (char**)pda->ann_text;
- while(*annotations) {
-
_annotations
.push_back(QString::fromUtf8(*annotations));
+ while
(*annotations) {
+
annotations_
.push_back(QString::fromUtf8(*annotations));
annotations++;
}
}
uint64_t Annotation::start_sample() const
{
annotations++;
}
}
uint64_t Annotation::start_sample() const
{
- return
_start_sample
;
+ return
start_sample_
;
}
uint64_t Annotation::end_sample() const
{
}
uint64_t Annotation::end_sample() const
{
- return
_end_sample
;
+ return
end_sample_
;
}
int Annotation::format() const
{
}
int Annotation::format() const
{
- return
_format
;
+ return
format_
;
}
const std::vector<QString>& Annotation::annotations() const
{
}
const std::vector<QString>& Annotation::annotations() const
{
- return
_annotations
;
+ return
annotations_
;
}
} // namespace decode
}
} // namespace decode