TabularDecView: Make the model/view work

[pulseview.git] / pv / data / decodesignal.hpp

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 0e5d38c6b2879f4b94461ce4037b4454e7fd4f41..51745b7baab8a8d3bf1237e80d9fa96bb10a458e 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -42,7 +42,6 @@ using std::condition_variable;
 using std::deque;
 using std::map;
 using std::mutex;
-using std::pair;
 using std::vector;
 using std::shared_ptr;
 
@@ -78,11 +77,17 @@ struct DecodeBinaryClass
 
 struct DecodeSegment
 {
+       // Constructor is a no-op
+       DecodeSegment() { };
+       // Copy constructor is a no-op
+       DecodeSegment(DecodeSegment&& ds) { (void)ds; };
+
        map<const Row*, RowData> annotation_rows;
        pv::util::Timestamp start_time;
        double samplerate;
        int64_t samples_decoded_incl, samples_decoded_excl;
        vector<DecodeBinaryClass> binary_classes;
+       deque<const Annotation*> all_annotations;
 };
 
 class DecodeSignal : public SignalBase
@@ -150,7 +155,7 @@ public:
         * Note: The annotations may be unsorted and only annotations that fully
         * fit into the sample range are considered.
         */
-       void get_annotation_subset(vector<Annotation> &dest, const Row* row,
+       void get_annotation_subset(deque<const Annotation*> &dest, const Row* row,
                uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
 
        /**
@@ -158,7 +163,7 @@ public:
         * Note: The annotations may be unsorted and only annotations that fully
         * fit into the sample range are considered.
         */
-       void get_annotation_subset(vector<Annotation> &dest, uint32_t segment_id,
+       void get_annotation_subset(deque<const Annotation*> &dest, uint32_t segment_id,
                uint64_t start_sample, uint64_t end_sample) const;
 
        uint32_t get_binary_data_chunk_count(uint32_t segment_id,
@@ -177,6 +182,8 @@ public:
        const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
                const Decoder* dec, uint32_t bin_class_id) const;
 
+       const deque<const Annotation*>* get_all_annotations_by_segment(uint32_t segment_id) const;
+
        virtual void save_settings(QSettings &settings) const;
 
        virtual void restore_settings(QSettings &settings);