projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 760d336e14c4dcb65628b2ebb9a8bff31849754e..c2ae9116856161a94826db1adeadcfe9366d647b 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-32,8
+32,8
@@
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
#include <pv/view/logicsignal.h>
#include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.h>
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-94,8
+94,7
@@
int64_t DecoderStack::samples_decoded() const
return _samples_decoded;
}
return _samples_decoded;
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
{
lock_guard<mutex> lock(_mutex);
return _annotations;
@@
-133,7
+132,7
@@
void DecoderStack::begin_decode()
// Get the samplerate and start time
_start_time = data->get_start_time();
// Get the samplerate and start time
_start_time = data->get_start_time();
- _samplerate = data->
get_
samplerate();
+ _samplerate = data->samplerate();
if (_samplerate == 0.0)
_samplerate = 1.0;
if (_samplerate == 0.0)
_samplerate = 1.0;
@@
-143,6
+142,14
@@
void DecoderStack::begin_decode()
void DecoderStack::clear()
{
void DecoderStack::clear()
{
+ _annotations.clear();
+}
+
+uint64_t DecoderStack::get_max_sample_count() const
+{
+ if (_annotations.empty())
+ return 0;
+ return _annotations.back().end_sample();
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@
-222,16
+229,15
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using
namespace pv::view::decode
;
+ using
pv::data::decode::Annotation
;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
lock_guard<mutex> lock(d->_mutex);
- d->_annotations.push_back(
a
);
+ d->_annotations.push_back(
Annotation(pdata)
);
d->new_decode_data();
}
d->new_decode_data();
}