Extract only the subset of annotations that are in view.

[pulseview.git] / pv / data / decoderstack.h

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 844a2b547cef8f353007e09029b855024c2a4f44..9d032ad9756080c19fc8a83d5bc6f407260b906e 100644 (file)
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -23,7 +23,7 @@
 
 #include "signaldata.h"
 
-#include <map>
+#include <list>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
@@ -31,8 +31,6 @@
 #include <QObject>
 #include <QString>
 
-#include <glib.h>
-
 struct srd_decoder;
 struct srd_probe;
 struct srd_proto_data;
@@ -45,15 +43,15 @@ namespace pv {
 
 namespace view {
 class LogicSignal;
+}
+
+namespace data {
 
 namespace decode {
 class Annotation;
+class Decoder;
 }
 
-}
-
-namespace data {
-
 class Logic;
 
 class DecoderStack : public QObject, public SignalData
@@ -70,29 +68,44 @@ public:
 
        virtual ~DecoderStack();
 
-       const srd_decoder* decoder() const;
-
-       const std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >&
-               probes() const;
-       void set_probes(std::map<const srd_probe*,
-               boost::shared_ptr<view::LogicSignal> > probes);
+       const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
+       void push(boost::shared_ptr<decode::Decoder> decoder);
+       void remove(int index);
 
-       const GHashTable* options() const;
+       int64_t samples_decoded() const;
 
-       void set_option(const char *id, GVariant *value);
-
-       const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-               annotations() const;
+       /**
+        * Extracts sorted annotations between two period into a vector.
+        */
+       void get_annotation_subset(
+               std::vector<pv::data::decode::Annotation> &dest,
+               uint64_t start_sample, uint64_t end_sample) const;
 
        QString error_message();
 
-       void clear_snapshots();
+       void clear();
+
+       uint64_t get_max_sample_count() const;
 
-private:
        void begin_decode();
 
+private:
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
+       bool index_entry_start_sample_gt(
+               const uint64_t sample, const size_t index) const;
+       bool index_entry_end_sample_lt(
+               const size_t index, const uint64_t sample) const;
+       bool index_entry_end_sample_gt(
+               const uint64_t sample, const size_t index) const;
+
+       void insert_annotation_into_start_index(
+               const pv::data::decode::Annotation &a,
+               const size_t storage_offset);
+       void insert_annotation_into_end_index(
+               const pv::data::decode::Annotation &a,
+               const size_t storage_offset);
+
        static void annotation_callback(srd_proto_data *pdata,
                void *decoder);
 
@@ -109,14 +122,19 @@ private:
         */
        static boost::mutex _global_decode_mutex;
 
-       const srd_decoder *const _decoder;
-       std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
-               _probes;
-       GHashTable *_options;
+       std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
        mutable boost::mutex _mutex;
-       std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-               _annotations;
+       int64_t _samples_decoded;
+       std::vector<pv::data::decode::Annotation> _annotations;
+
+       /**
+        * _ann_start_index and _ann_end_index contain lists of annotions
+        * (represented by offsets in the _annotations vector), sorted in
+        * ascending ordered by the start_sample and end_sample respectively.
+        */
+       std::vector<size_t> _ann_start_index, _ann_end_index;
+
        QString _error_message;
 
        boost::thread _decode_thread;