projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all srd commands into decode thread, implemented error messages
[pulseview.git]
/
pv
/
data
/
decoder.h
diff --git
a/pv/data/decoder.h
b/pv/data/decoder.h
index dcf12fe1d4b5d2b8c6696442682bc9f5217ea2e6..09002ac911153ed06901af6ab1ba3e0927b1f4c7 100644
(file)
--- a/
pv/data/decoder.h
+++ b/
pv/data/decoder.h
@@
-28,48
+28,87
@@
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <QObject>
+#include <QString>
+
+#include <glib.h>
+
struct srd_decoder;
struct srd_decoder;
-struct srd_decoder_inst;
struct srd_probe;
struct srd_probe;
+struct srd_proto_data;
+
+namespace DecoderTest {
+class TwoDecoder;
+}
namespace pv {
namespace view {
namespace pv {
namespace view {
-class Signal;
+class LogicSignal;
+
+namespace decode {
+class Annotation;
+}
+
}
namespace data {
class Logic;
}
namespace data {
class Logic;
-class Decoder : public SignalData
+class Decoder : public
QObject, public
SignalData
{
{
+ Q_OBJECT
+
+private:
+ static const double DecodeMargin;
+ static const double DecodeThreshold;
+ static const int64_t DecodeChunkLength;
+
public:
Decoder(const srd_decoder *const decoder,
std::map<const srd_probe*,
public:
Decoder(const srd_decoder *const decoder,
std::map<const srd_probe*,
- boost::shared_ptr<pv::view::Signal> > probes);
+ boost::shared_ptr<pv::view::LogicSignal> > probes,
+ GHashTable *options);
virtual ~Decoder();
const srd_decoder* get_decoder() const;
virtual ~Decoder();
const srd_decoder* get_decoder() const;
- void begin_decode();
+ const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+ annotations() const;
+
+ QString error_message();
void clear_snapshots();
private:
void clear_snapshots();
private:
+ void begin_decode();
+
void init_decoder();
void decode_proc(boost::shared_ptr<data::Logic> data);
void init_decoder();
void decode_proc(boost::shared_ptr<data::Logic> data);
+ static void annotation_callback(srd_proto_data *pdata,
+ void *decoder);
+
+signals:
+ void new_decode_data();
+
private:
const srd_decoder *const _decoder;
private:
const srd_decoder *const _decoder;
- std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
+ std::map<const srd_probe*, boost::shared_ptr<view::
Logic
Signal> >
_probes;
_probes;
+ GHashTable *_options;
- srd_decoder_inst *_decoder_inst;
+ mutable boost::mutex _mutex;
+ std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+ _annotations;
+ QString _error_message;
boost::thread _decode_thread;
boost::thread _decode_thread;
+
+ friend class DecoderTest::TwoDecoder;
};
} // namespace data
};
} // namespace data